pht: use const reference for IndexEntry::TYPE

Adrien Béraud · aberaud · commit d12f9271b8f8 · 2025-09-22T14:41:22.000-04:00
Prevents static initialization order issue
diff --git a/include/opendht/indexation/pht.h b/include/opendht/indexation/pht.h
@@ -266,7 +266,7 @@ ee     *
 
 using Value = std::pair<InfoHash, dht::Value::Id>;
 struct OPENDHT_PUBLIC IndexEntry : public dht::Value::Serializable<IndexEntry> {
-    static const ValueType TYPE;
+    static const ValueType& TYPE;
 
     virtual void unpackValue(const dht::Value& v) {
         Serializable<IndexEntry>::unpackValue(v);
diff --git a/src/indexation/pht.cpp b/src/indexation/pht.cpp
@@ -145,7 +145,7 @@ int Pht::Cache::lookup(const Prefix& p) {
     return pos;
 }
 
-const ValueType IndexEntry::TYPE = ValueType::USER_DATA;
+const ValueType& IndexEntry::TYPE = ValueType::USER_DATA;
 constexpr std::chrono::minutes Pht::Cache::NODE_EXPIRE_TIME;
 
 void Pht::lookupStep(Prefix p, std::shared_ptr<int> lo, std::shared_ptr<int> hi,

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ int Pht::Cache::lookup(const Prefix& p) {`
`145`	`145`	`return pos;`
`146`	`146`	`}`
`147`	`147`
`148`		`-const ValueType IndexEntry::TYPE = ValueType::USER_DATA;`
	`148`	`+const ValueType& IndexEntry::TYPE = ValueType::USER_DATA;`
`149`	`149`	`constexpr std::chrono::minutes Pht::Cache::NODE_EXPIRE_TIME;`
`150`	`150`
`151`	`151`	`void Pht::lookupStep(Prefix p, std::shared_ptr<int> lo, std::shared_ptr<int> hi,`