Merge branch 'master' of http://www.hyzgame.com:3000/hyzboy/CMCore

hyzboy · hyzboy · commit 511dd86c5638 · 2025-05-09T01:09:41.000+08:00
diff --git a/inc/hgl/Macro.h b/inc/hgl/Macro.h
@@ -77,4 +77,6 @@ namespace hgl
                                                 name=nullptr;   \
                                             }   \
                                         }
-}//namespace hgl
+
+    #define SAFE_CLEAR_STD_MAP(name)    {for(auto &it:name)delete it.second;}
+}//namespace hgl
diff --git a/inc/hgl/type/StringInstance.h b/inc/hgl/type/StringInstance.h
@@ -400,7 +400,7 @@ namespace hgl
 
             if(need_length>malloc_length)
             {
-                malloc_length=power_to_2(need_length);
+                malloc_length=power_to_2(need_length+1);
 
                 T *new_str=new T[malloc_length];
 

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,6 @@ namespace hgl`
`77`	`77`	`name=nullptr; \`
`78`	`78`	`} \`
`79`	`79`	`}`
`80`		`-}//namespace hgl`
	`80`	`+`
	`81`	`+ #define SAFE_CLEAR_STD_MAP(name) {for(auto &it:name)delete it.second;}`
	`82`	`+}//namespace hgl`
Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ namespace hgl`
`400`	`400`
`401`	`401`	`if(need_length>malloc_length)`
`402`	`402`	`{`
`403`		`- malloc_length=power_to_2(need_length);`
	`403`	`+ malloc_length=power_to_2(need_length+1);`
`404`	`404`
`405`	`405`	`T *new_str=new T[malloc_length];`
`406`	`406`