improve definition of resource

XmacsLabs · Apr 14, 2024 · a03dece · a03dece
1 parent 11a45be
commit a03dece
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Kernel/Abstractions/resource.hpp b/Kernel/Abstractions/resource.hpp
@@ -27,9 +27,10 @@ template <class R> class resource_ptr {
   ~resource_ptr (){};
 
 public:
-  R*                              rep;
-  static hashmap<string, pointer> instances;
-  inline R*                       operator->() { return rep; }
+  R*                                     rep;
+  inline static hashmap<string, pointer> instances=
+      hashmap<string, pointer> (NULL); // C++17 feature
+  inline R* operator->() { return rep; }
 };
 
 #if (defined(_WIN32) || defined(_WIN64))
@@ -51,14 +52,10 @@ template <class R> class resource_ptr {
   }
 #endif
 
-#if (defined(_WIN32) || defined(_WIN64))
-#define RESOURCE_CODE(PTR)                                                     \
-  hashmap<string, pointer> resource_ptr<PTR##_rep>::instances (NULL);
-#else
-#define RESOURCE_CODE(PTR)                                                     \
-  template <>                                                                  \
-  hashmap<string, pointer> resource_ptr<PTR##_rep>::instances (NULL);
-#endif
+/**
+ * @deprecated
+ */
+#define RESOURCE_CODE(PTR)
 
 template <class R>
 inline bool

diff --git a/lolly/system/shared_lib.cpp b/lolly/system/shared_lib.cpp
@@ -24,5 +24,4 @@ load_shared_library (string name, url path) {
 
 } // namespace system
 } // namespace lolly
-RESOURCE_CODE (lolly::system::shared_lib);
 #endif