Skip to content

Commit e5783dd

Browse files
committed
Add "#undef registry_type_list" to fix GCC warnings
1 parent 39f9f5c commit e5783dd

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/xrGame/alife_registry_container_composition.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@
2727
template <typename _index_type, typename _data_type>
2828
class CALifeAbstractRegistry;
2929

30-
//для всех персонажей, те порции информации, которые они помнят
31-
typedef CALifeAbstractRegistry<u16, KNOWN_INFO_VECTOR> CInfoPortionRegistry;
30+
//для всех персонажей, те порции информации, которые они помнят
31+
typedef CALifeAbstractRegistry<u16, KNOWN_INFO_VECTOR> CInfoPortionRegistry;
3232
add_to_registry_type_list(CInfoPortionRegistry)
3333
#define info_portions define_constant(CInfoPortionRegistry)
34+
#undef registry_type_list
3435
#define registry_type_list save_registry_type_list(CInfoPortionRegistry)
3536

3637
//для всех персонажей, отношения с другими персонажами
3738
typedef CALifeAbstractRegistry<u16, RELATION_DATA> CRelationRegistry;
3839
add_to_registry_type_list(CRelationRegistry)
3940
#define character_relations define_constant(CRelationRegistry)
41+
#undef registry_type_list
4042
#define registry_type_list save_registry_type_list(CRelationRegistry)
4143

4244
////для актеров, список персонажей с которыми были разговоры
@@ -55,27 +57,32 @@ add_to_registry_type_list(CRelationRegistry)
5557
typedef CALifeAbstractRegistry<u16, GAME_NEWS_VECTOR> CGameNewsRegistry;
5658
add_to_registry_type_list(CGameNewsRegistry)
5759
#define game_news define_constant(CGameNewsRegistry)
60+
#undef registry_type_list
5861
#define registry_type_list save_registry_type_list(CGameNewsRegistry)
5962

6063
//список описаний персонажей, которые уже задействованы в игре
6164
typedef CALifeAbstractRegistry<shared_str, int> CSpecificCharacterRegistry;
6265
add_to_registry_type_list(CSpecificCharacterRegistry)
6366
#define specific_characters define_constant(CSpecificCharacterRegistry)
67+
#undef registry_type_list
6468
#define registry_type_list save_registry_type_list(CSpecificCharacterRegistry)
6569

6670
// map locations for actor
6771
add_to_registry_type_list(CMapLocationRegistry)
6872
#define map_locations define_constant(CMapLocationRegistry)
73+
#undef registry_type_list
6974
#define registry_type_list save_registry_type_list(CMapLocationRegistry)
7075

7176
// game tasks for actor
7277
add_to_registry_type_list(CGameTaskRegistry)
7378
#define map_locations define_constant(CGameTaskRegistry)
79+
#undef registry_type_list
7480
#define registry_type_list save_registry_type_list(CGameTaskRegistry)
7581

7682
// ActorStatistics
7783
add_to_registry_type_list(CActorStatisticRegistry)
7884
#define map_locations define_constant(CActorStatisticRegistry)
85+
#undef registry_type_list
7986
#define registry_type_list save_registry_type_list(CActorStatisticRegistry)
8087

8188
#pragma warning(pop)

0 commit comments

Comments
 (0)