review

Author: x87

source/ScmFunction.cpp

@@ -6,8 +6,7 @@
 namespace CLEO
 {
     ScmFunction* ScmFunction::store[Store_Size] = {0};
-    const size_t Default_Index                  = 1;
-    size_t ScmFunction::allocationPlace         = Default_Index;
+    size_t ScmFunction::allocationPlace         = ScmFunction::Default_Index;
 
     ScmFunction* ScmFunction::Get(unsigned short idx)
     {
@@ -22,15 +21,15 @@ namespace CLEO
         {
             if (scmFunc != nullptr) delete scmFunc;
         }
-        ScmFunction::allocationPlace = Default_Index;
+        ScmFunction::allocationPlace = ScmFunction::Default_Index;
     }
 
     void* ScmFunction::operator new(size_t size)
     {
         size_t start_search = allocationPlace;
         while (store[allocationPlace] != nullptr) // find first unused position in store
         {
-            if (++allocationPlace >= Store_Size) allocationPlace = Default_Index; // end of store reached
+            if (++allocationPlace >= Store_Size) allocationPlace = ScmFunction::Default_Index; // end of store reached
             if (allocationPlace == start_search)
             {
                 SHOW_ERROR("CLEO function storage stack overflow!");

source/ScmFunction.h

@@ -6,7 +6,8 @@ namespace CLEO
 {
     struct ScmFunction
     {
-        static const size_t Store_Size = 0x400;
+        static constexpr size_t Store_Size = 0x400;
+        static constexpr size_t Default_Index = 1;
         static ScmFunction* store[Store_Size];
         static size_t allocationPlace; // contains an index of last allocated object
         static ScmFunction* Get(unsigned short idx);