dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: LIST_SWAP re-definition warning

Browse Source 
Happens on Apple M2 platform. Caused by indirectly included queue.h
via tbb, which has its own LIST_SWAP.

Rename our macro to `LISTBASE_SWAP` to avoid conflicts.

Pull Request: https://projects.blender.org/blender/blender/pulls/110943
This commit is contained in:
Sergey Sharybin
2023-08-09 10:23:08 +02:00
committed by Sergey Sharybin
parent 090f365cbd
commit db4f926c92
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/intern/blender.cc
+8 -8
View File
@@ -356,7 +356,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
} \
((void)0)
#define LIST_SWAP(id) \
#define LISTBASE_SWAP(id) \
{ \
SWAP(ListBase, userdef_a->id, userdef_b->id); \
} \
@@ -373,12 +373,12 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
} \
((void)0)
LIST_SWAP(uistyles);
LIST_SWAP(uifonts);
LIST_SWAP(themes);
LIST_SWAP(addons);
LIST_SWAP(user_keymaps);
LIST_SWAP(user_keyconfig_prefs);
LISTBASE_SWAP(uistyles);
LISTBASE_SWAP(uifonts);
LISTBASE_SWAP(themes);
LISTBASE_SWAP(addons);
LISTBASE_SWAP(user_keymaps);
LISTBASE_SWAP(user_keyconfig_prefs);
DATA_SWAP(font_path_ui);
DATA_SWAP(font_path_ui_mono);
@@ -394,7 +394,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
#undef SWAP_TYPELESS
#undef DATA_SWAP
#undef LIST_SWAP
#undef LISTBASE_SWAP
#undef FLAG_SWAP
}