Remove STL source location

Author: nickclark2016

projects/core/include/tempest/assert.hpp

@@ -19,7 +19,7 @@ namespace tempest::assertion::detail
 } // namespace tempest::assertion::detail
 
 #define TEMPEST_ASSERT(expr)                                                                                           \
-    tempest::assertion::detail::do_basic_assrtt((expr), tempest::source_location::current(), #expr)
+    tempest::assertion::detail::do_basic_assrtt((expr), TEMPEST_CURRENT_SOURCE_LOCATION(), #expr)
 
 #else
 

projects/core/include/tempest/memory.hpp

@@ -200,7 +200,7 @@ namespace tempest
     {
       public:
         virtual ~abstract_allocator() = default;
-        virtual void* allocate(size_t size, size_t alignment, source_location loc = source_location::current()) = 0;
+        virtual void* allocate(size_t size, size_t alignment, source_location loc = TEMPEST_CURRENT_SOURCE_LOCATION()) = 0;
         virtual void deallocate(void* ptr) = 0;
     };
 
@@ -217,7 +217,7 @@ namespace tempest
         stack_allocator& operator=(stack_allocator&& rhs) noexcept;
 
         [[nodiscard]] void* allocate(size_t size, size_t alignment,
-                                     source_location loc = source_location::current()) override;
+                                     source_location loc = TEMPEST_CURRENT_SOURCE_LOCATION()) override;
         void deallocate(void* ptr) override;
 
         size_t get_marker() const noexcept;
@@ -243,7 +243,7 @@ namespace tempest
         heap_allocator& operator=(heap_allocator&& rhs) noexcept;
 
         [[nodiscard]] void* allocate(size_t size, size_t alignment,
-                                     source_location loc = source_location::current()) override;
+                                     source_location loc = TEMPEST_CURRENT_SOURCE_LOCATION()) override;
         void deallocate(void* ptr) override;
 
       private:

projects/core/include/tempest/meta.hpp

@@ -13,7 +13,7 @@ namespace tempest::core
     template <typename T>
     constexpr auto get_type_name() noexcept
     {
-        auto src = tempest::source_location::current();
+        auto src = TEMPEST_CURRENT_SOURCE_LOCATION();
         string_view here = src.function_name();
 
 #if defined(_MSC_VER) && !defined(__clang__)

projects/core/include/tempest/source_location.hpp

@@ -3,28 +3,13 @@
 
 #include <tempest/int.hpp>
 
-#include <source_location>
-
 namespace tempest
 {
     struct source_location
     {
       public:
-#if defined(_MSC_VER)
-        static consteval source_location current(const uint32_t line = __builtin_LINE(),
-                                                 const uint32_t column = __builtin_COLUMN(),
-                                                 const char* file = __builtin_FILE(),
-                                                 const char* func = __builtin_FUNCSIG()) noexcept;
-#elif defined(__GNUC__)
-        static consteval source_location current(const uint32_t line = __builtin_LINE(),
-                                                 const uint32_t column = __builtin_COLUMN(),
-                                                 const char* file = __builtin_FILE(),
-                                                 const char* func = __builtin_source_location()->_M_function_name) noexcept;
-#else
-#error "Unsupported compiler."
-#endif
-
         constexpr source_location() noexcept = default;
+        consteval source_location(const uint32_t line, const uint32_t column, const char* file, const char* func);
 
         constexpr const char* file_name() const noexcept;
         constexpr const char* function_name() const noexcept;
@@ -33,47 +18,51 @@ namespace tempest
         constexpr size_t column() const noexcept;
 
       private:
-        struct impl
-        {
-            const char* _file = nullptr;
-            const char* _function = nullptr;
-            uint32_t _line = 0;
-            uint32_t _column = 0;
-        };
-
-        impl _impl;
+        const char* _file = nullptr;
+        const char* _function = nullptr;
+        uint32_t _line = 0;
+        uint32_t _column = 0;
     };
 
-    inline consteval source_location source_location::current(const uint32_t line, const uint32_t column,
-                                                              const char* file, const char* func) noexcept
+    inline consteval source_location::source_location(const uint32_t line, const uint32_t column, const char* file,
+                                                      const char* func)
+        : _file{file}, _function{func}, _line{line}, _column{column}
     {
-        source_location loc;
-        loc._impl._file = file;
-        loc._impl._function = func;
-        loc._impl._line = line;
-        loc._impl._column = column;
-        return loc;
     }
 
     inline constexpr const char* source_location::file_name() const noexcept
     {
-        return _impl._file;
+        return _file;
     }
 
     inline constexpr const char* source_location::function_name() const noexcept
     {
-        return _impl._function;
+        return _function;
     }
 
     inline constexpr size_t source_location::line() const noexcept
     {
-        return _impl._line;
+        return _line;
     }
 
     inline constexpr size_t source_location::column() const noexcept
     {
-        return _impl._column;
+        return _column;
     }
 } // namespace tempest
 
+#if defined(_MSC_VER)
+
+#define TEMPEST_CURRENT_SOURCE_LOCATION()                                                                              \
+    ::tempest::source_location::source_location(__builtin_LINE(), __builtin_COLUMN(), __builtin_FILE(),                \
+                                                __builtin_FUNCSIG())
+
+#elif defined(__GNUC__)
+
+#define TEMPEST_CURRENT_SOURCE_LOCATION()                                                                              \
+    ::tempest::source_location::source_location(__builtin_LINE(), __builtin_COLUMN(), __builtin_FILE(),                \
+                                                __PRETTY_FUNCTION__)
+
+#endif
+
 #endif // tempest_core_source_location_hpp

projects/math/tests/mat4_test.cpp

@@ -6,9 +6,9 @@
 using tempest::math::mat4;
 using tempest::math::vec4;
 
-TEST(Mat4F, DefaultConstructor)
+TEST(Mat4F, ZeroInit)
 {
-    mat4<float> m;
+    mat4<float> m{};
 
     ASSERT_FLOAT_EQ(m[0][0], 0.0f);
     ASSERT_FLOAT_EQ(m[0][1], 0.0f);