[instance] group static variable declaration in Instance together (…

…openthread#11193)
espressif · Jan 28, 2025 · 27782ad · 27782ad
1 parent c25120e
commit 27782ad
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/src/core/instance/instance.hpp b/src/core/instance/instance.hpp
@@ -442,6 +442,23 @@ class Instance : public otInstance, private NonCopyable
     void AfterInit(void);
 #endif
 
+    //-----------------------------------------------------------------------------------------------------------------
+    // `static` variables
+
+#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
+    static LogLevel sLogLevel;
+#endif
+
+#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+    static Utils::Heap *sHeap;
+#endif
+
+#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
+    static bool sDnsNameCompressionEnabled;
+#endif
+
+    //-----------------------------------------------------------------------------------------------------------------
+
     // Order of variables (their initialization in `Instance`)
     // is important.
     //
@@ -457,11 +474,8 @@ class Instance : public otInstance, private NonCopyable
 #if OPENTHREAD_MTD || OPENTHREAD_FTD
     // Random::Manager is initialized before other objects. Note that it
     // requires MbedTls which itself may use Heap.
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
-    static Utils::Heap *sHeap;
-#endif
     Crypto::MbedTls mMbedTls;
-#endif // OPENTHREAD_MTD || OPENTHREAD_FTD
+#endif
 
     Random::Manager mRandomManager;
 
@@ -720,10 +734,6 @@ class Instance : public otInstance, private NonCopyable
     Mac::LinkRaw mLinkRaw;
 #endif
 
-#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
-    static LogLevel sLogLevel;
-#endif
-
 #if OPENTHREAD_ENABLE_VENDOR_EXTENSION
     Extension::ExtensionBase &mExtension;
 #endif
@@ -737,10 +747,6 @@ class Instance : public otInstance, private NonCopyable
 
     bool mIsInitialized;
 
-#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE && (OPENTHREAD_FTD || OPENTHREAD_MTD)
-    static bool sDnsNameCompressionEnabled;
-#endif
-
     uint32_t mId;
 };