misc

nokia · Jun 24, 2024 · 425ee04 · 425ee04
1 parent edec0ea
commit 425ee04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/domino/HdlrDomino.hpp b/src/domino/HdlrDomino.hpp
@@ -31,8 +31,8 @@
 
 #include "MsgSelf.hpp"
 #include "ObjAnywhere.hpp"
+#include "SafePtr.hpp"
 #include "UniLog.hpp"
-#include "UniPtr.hpp"
 
 namespace RLib
 {

diff --git a/src/obj_anywhere/ObjAnywhere.hpp b/src/obj_anywhere/ObjAnywhere.hpp
@@ -60,7 +60,7 @@ class ObjAnywhere
 
 private:
     // -------------------------------------------------------------------------------------------
-    static shared_ptr<DataStore<ObjName>> name_obj_S_;  // store aObj w/o include aObj.hpp
+    static shared_ptr<DataStore<ObjName>> name_obj_S_;  // store aObj w/o include aObj.hpp; shared_ptr is safe here
 };
 
 // ***********************************************************************************************

diff --git a/src/safe_mem/SafePtr.hpp b/src/safe_mem/SafePtr.hpp
@@ -48,7 +48,7 @@ class SafePtr
     // - safe-only creation, eg can't construct by raw ptr/shared_ptr that maybe unsafe
     // - can't create by SafePtr(ConstructArgs...) that confuse cp constructor, make_safe() instead
     // - T(ConstructArgs) SHALL mem-safe
-    SafePtr(nullptr_t = nullptr) noexcept {}
+    constexpr SafePtr(nullptr_t = nullptr) noexcept {}
     template<typename U, typename... ConstructArgs> friend SafePtr<U> make_safe(ConstructArgs&&... aArgs);
 
     // safe-only cast (vs shared_ptr, eg static_pointer_cast<any> is not safe)

diff --git a/src/thread/MtInQueue.hpp b/src/thread/MtInQueue.hpp
@@ -36,8 +36,9 @@ using namespace std;
 
 namespace RLib
 {
-// ele & its typeid.hash_code
-using ELE_TID = pair<UniPtr, type_index>;  // type_index ==/!= ok, but type_info* & hash_code nok
+// - ele & its type_index(==/!= ok, but type_info* & hash_code nok)
+// - shared_ptr is safe to cast void since type_index (but not safe as SafePtr's create)
+using ELE_TID = pair<UniPtr, type_index>;
 using EleHdlr = function<void(UniPtr)>;
 
 // ***********************************************************************************************