[Bf-blender-cvs] [6d3cd34bd51] functions: fix compile error

Jacques Lucke noreply at git.blender.org
Wed Dec 11 17:13:31 CET 2019


Commit: 6d3cd34bd518220f3fa3bc9bc687836a490fcb8b
Author: Jacques Lucke
Date:   Wed Dec 11 17:13:16 2019 +0100
Branches: functions
https://developer.blender.org/rB6d3cd34bd518220f3fa3bc9bc687836a490fcb8b

fix compile error

===================================================================

M	source/blender/blenlib/BLI_static_class_ids.h

===================================================================

diff --git a/source/blender/blenlib/BLI_static_class_ids.h b/source/blender/blenlib/BLI_static_class_ids.h
index 40bac7f6163..d048fef64ae 100644
--- a/source/blender/blenlib/BLI_static_class_ids.h
+++ b/source/blender/blenlib/BLI_static_class_ids.h
@@ -12,11 +12,13 @@ template<typename T> class_id_t get_class_id();
 }  // namespace BLI
 
 #define BLI_CREATE_CLASS_ID_UTIL1(class_name, id) \
+  namespace BLI { \
   static char class_id_char##id = 0; \
-  static BLI::class_id_t class_id##id = (BLI::class_id_t)&class_id_char##id; \
-  template<> BLI::class_id_t BLI::get_class_id<class_name>() \
+  static class_id_t class_id##id = (class_id_t)&class_id_char##id; \
+  template<> class_id_t get_class_id<class_name>() \
   { \
     return class_id##id; \
+  } \
   }
 
 #define BLI_CREATE_CLASS_ID_UTIL2(class_name, id) BLI_CREATE_CLASS_ID_UTIL1(class_name, id)



More information about the Bf-blender-cvs mailing list