restore DynamicLibraryFunctionPointer to its former glory

Author: devshgraphicsprogramming

include/nbl/system/DynamicLibraryFunctionPointer.h

@@ -1,34 +1,32 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2022 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
-#if 0 // kill it
-
 #ifndef __NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED__
 #define __NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED__
 
 
 #include "nbl/core/declarations.h"
+#include "nbl/core/string/StringLiteral.h"
 
 #include <functional>
 
 
 namespace nbl::system
 {
 
-template<typename FuncT, class UniqueStringType>
+template<typename FuncT, core::StringLiteral name>
 class NBL_API DynamicLibraryFunctionPointer
 {
 	public:
 		using result_type = typename std::function<FuncT>::result_type;
 
-		DynamicLibraryFunctionPointer() : p(nullptr) {}
-		DynamicLibraryFunctionPointer(DynamicLibraryFunctionPointer&& other) : DynamicLibraryFunctionPointer()
+		inline DynamicLibraryFunctionPointer() : p(nullptr) {}
+		inline DynamicLibraryFunctionPointer(DynamicLibraryFunctionPointer&& other) : DynamicLibraryFunctionPointer()
 		{
 			operator=(std::move(other));
 		}
-		DynamicLibraryFunctionPointer(void* ptr) : p(reinterpret_cast<FuncT*>(ptr)) {}
-		~DynamicLibraryFunctionPointer()
+		inline DynamicLibraryFunctionPointer(void* ptr) : p(reinterpret_cast<FuncT*>(ptr)) {}
+		inline ~DynamicLibraryFunctionPointer()
 		{
 			p = nullptr;
 		}
@@ -47,7 +45,7 @@ class NBL_API DynamicLibraryFunctionPointer
 			if (p)
 				return p(std::forward<T>(args)...);
 			assert(error);
-			return error(name);
+			return error(name.value);
 		}*/
 
 		template<typename... T>
@@ -56,7 +54,7 @@ class NBL_API DynamicLibraryFunctionPointer
 			if (p)
 				return p(std::forward<T>(args)...);
 			else if (error)
-				error(name);
+				error(name.value);
 			if constexpr (!std::is_void_v<result_type>)
 			{
 				return result_type{};
@@ -83,14 +81,10 @@ class NBL_API DynamicLibraryFunctionPointer
 
 	protected:
 		FuncT* p;
-
-		const char* name = UniqueStringType::value;
 };
 
 }
 
 #define NBL_SYSTEM_DECLARE_DYNLIB_FUNCPTR(FUNC_NAME) nbl::system::DynamicLibraryFunctionPointer<decltype(FUNC_NAME),NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(#FUNC_NAME)> p ## FUNC_NAME;
 
-#endif
-
-#endif 
+#endif