Add "#undef registry_type_list" to fix GCC warnings

OpenXRay · Sep 29, 2018 · e5783dd · e5783dd
1 parent 39f9f5c
commit e5783dd
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/xrGame/alife_registry_container_composition.h b/src/xrGame/alife_registry_container_composition.h
@@ -27,16 +27,18 @@
 template <typename _index_type, typename _data_type>
 class CALifeAbstractRegistry;
 
-//для всех персонажей, те порции информации, которые они помнят
-typedef CALifeAbstractRegistry<u16, KNOWN_INFO_VECTOR> CInfoPortionRegistry;
+    //для всех персонажей, те порции информации, которые они помнят
+    typedef CALifeAbstractRegistry<u16, KNOWN_INFO_VECTOR> CInfoPortionRegistry;
 add_to_registry_type_list(CInfoPortionRegistry)
 #define info_portions define_constant(CInfoPortionRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CInfoPortionRegistry)
 
     //для всех персонажей, отношения с другими персонажами
     typedef CALifeAbstractRegistry<u16, RELATION_DATA> CRelationRegistry;
 add_to_registry_type_list(CRelationRegistry)
 #define character_relations define_constant(CRelationRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CRelationRegistry)
 
     ////для актеров, список персонажей с которыми были разговоры
@@ -55,27 +57,32 @@ add_to_registry_type_list(CRelationRegistry)
     typedef CALifeAbstractRegistry<u16, GAME_NEWS_VECTOR> CGameNewsRegistry;
 add_to_registry_type_list(CGameNewsRegistry)
 #define game_news define_constant(CGameNewsRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CGameNewsRegistry)
 
     //список описаний персонажей, которые уже задействованы в игре
     typedef CALifeAbstractRegistry<shared_str, int> CSpecificCharacterRegistry;
 add_to_registry_type_list(CSpecificCharacterRegistry)
 #define specific_characters define_constant(CSpecificCharacterRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CSpecificCharacterRegistry)
 
     // map locations for actor
     add_to_registry_type_list(CMapLocationRegistry)
 #define map_locations define_constant(CMapLocationRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CMapLocationRegistry)
 
     // game tasks for actor
     add_to_registry_type_list(CGameTaskRegistry)
 #define map_locations define_constant(CGameTaskRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CGameTaskRegistry)
 
     // ActorStatistics
     add_to_registry_type_list(CActorStatisticRegistry)
 #define map_locations define_constant(CActorStatisticRegistry)
+#undef registry_type_list
 #define registry_type_list save_registry_type_list(CActorStatisticRegistry)
 
 #pragma warning(pop)