Merge pull request #5288 from N-Dekker/MersenneTwisterRandomVariateGenerator-avoid-protected-data

Avoid protected data MersenneTwisterRandomVariateGenerator

Author: thewtex

Modules/Core/Common/include/itkMersenneTwisterRandomVariateGenerator.h

@@ -268,9 +268,6 @@ class ITKCommon_EXPORT MersenneTwisterRandomVariateGenerator : public RandomVari
   void
   PrintSelf(std::ostream & os, Indent indent) const override;
 
-  /** Period parameter */
-  static constexpr unsigned int M = 397;
-
   /** Reload array with N new values. */
   void
   reload();
@@ -305,6 +302,14 @@ class ITKCommon_EXPORT MersenneTwisterRandomVariateGenerator : public RandomVari
   static IntegerType
   hash(time_t t, clock_t c);
 
+private:
+  /** Only used to synchronize the global variable across static libraries.*/
+  itkGetGlobalDeclarationMacro(MersenneTwisterGlobals, PimplGlobals);
+
+  /** Internal method to actually create a new object. */
+  static Pointer
+  CreateInstance();
+
   // Internal state
   IntegerType state[StateVectorLength];
 
@@ -317,14 +322,6 @@ class ITKCommon_EXPORT MersenneTwisterRandomVariateGenerator : public RandomVari
   // Seed value
   std::atomic<IntegerType> m_Seed{};
 
-private:
-  /** Only used to synchronize the global variable across static libraries.*/
-  itkGetGlobalDeclarationMacro(MersenneTwisterGlobals, PimplGlobals);
-
-  /** Internal method to actually create a new object. */
-  static Pointer
-  CreateInstance();
-
   // Local lock to enable concurrent access to singleton
   std::mutex m_InstanceMutex{};
 
@@ -364,6 +361,9 @@ MersenneTwisterRandomVariateGenerator::reload()
   // Made clearer and faster by Matthew Bellew
   // matthew dot bellew at home dot com
 
+  // Period parameter
+  static constexpr unsigned int M = 397;
+
   // get rid of VS warning
   constexpr auto index = int{ M } - int{ MersenneTwisterRandomVariateGenerator::StateVectorLength };