Add get() functionality to static_pointer

Tests/assert.cpp

@@ -20,12 +20,12 @@ namespace
 
 bool assert_flag = false;
 
-void assertCallback(const char*, const int)
+void assertCallback(const char*, const char*, const int)
 {
   assert_flag = true;
 }
 
-}
+}// namespace
 
 TEST_CASE("Assert debug without NDEBUG gets triggered if check is false.", "[utility],[assert]")
 {

Tests/assert_ndebug.cpp

@@ -20,12 +20,12 @@ namespace
 
 bool assert_flag = false;
 
-void assertCallback(const char*, const int)
+void assertCallback(const char*, const char*, const int)
 {
   assert_flag = true;
 }
 
-}
+}// namespace
 
 TEST_CASE("Assert debug with NDEBUG is a null-opt.", "[utility],[assert]")
 {

Utility/Inc/utility_assert.hpp

@@ -8,26 +8,26 @@
 namespace Utility::Assert::Detail
 {
 
-void assertImpl(const bool expr, const char* file, const int line);
+void assertImpl(const char* expression, const char* file, const int line);
 
 }
 
 #ifndef NDEBUG
-# define SKULLC_ASSERT_DEBUG(e) Utility::Assert::Detail::assertImpl(e, __FILE__, __LINE__)
+#define SKULLC_ASSERT_DEBUG(e) (!(e) ? Utility::Assert::Detail::assertImpl(#e, __FILE__, __LINE__) : ((void) 0))
 #else
 #define SKULLC_ASSERT_DEBUG(e)
 #endif
 
-#define SKULLC_ASSERT_SAFE(e) Utility::Assert::Detail::assertImpl(e, __FILE__, __LINE__)
+#define SKULLC_ASSERT_SAFE(e) (!(e) ? Utility::Assert::Detail::assertImpl(#e, __FILE__, __LINE__) : ((void) 0))
 
 namespace Utility::Assert
 {
 
-using assert_cb = void (*)(const char* file, const int line);
+using assert_cb = void (*)(const char* expression, const char* file, const int line);
 
 void setHandler(assert_cb callback);
 assert_cb getHandler();
 
-}
+}// namespace Utility::Assert
 
 #endif// SKULLC_UTILITY_ASSERT_HPP_

Utility/Inc/utility_staticpointer.hpp

@@ -8,8 +8,11 @@
 #ifndef SKULLC_UTILITY_STATICPOINTER_HPP_
 #define SKULLC_UTILITY_STATICPOINTER_HPP_
 
+#include <new>
 #include <utility>
 
+#include <utility_assert.hpp>
+
 namespace Utility
 {
 
@@ -57,6 +60,17 @@ struct StaticPointer
     return initialized_;
   }
 
+  value_type* get()
+  {
+    SKULLC_ASSERT_DEBUG(initialized_);
+    return reinterpret_cast<value_type*>(storage);
+  }
+
+  const value_type* get() const
+  {
+    SKULLC_ASSERT_DEBUG(initialized_);
+    return reinterpret_cast<const value_type*>(storage);
+  }
 private:
   bool initialized_ = false;
 };

Utility/Src/utility_assert.cpp

@@ -19,18 +19,15 @@ namespace Utility::Assert
 namespace Detail
 {
 
-void assertImpl(const bool expr, const char* file, const int line)
+void assertImpl(const char* expression, const char* file, const int line)
-{
-  if (!expr)
 {
   if (INSTALLED_HANDLER)
-      INSTALLED_HANDLER(file, line);
+    INSTALLED_HANDLER(expression, file, line);
   else
     std::terminate();
 }
-}
 
-}
+}// namespace Detail
 
 void setHandler(assert_cb callback)
 {
@@ -42,4 +39,4 @@ assert_cb getHandler()
   return INSTALLED_HANDLER;
 }
 
-}
+}// namespace Utility::Assert