King_DuckZ/clooneljump
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix wrong macro usage.

Browse source 
This should work with both modern GCC and clang.
This commit is contained in:
King_DuckZ 2017-03-16 21:48:10 +00:00
parent c30b4e430e
commit 8669e5e674
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cloonel_vectorwrapper/vector_cast.hpp.in
View file

@ -21,8 +21,8 @@
//See vectorwrapper.hpp.in for comments //See vectorwrapper.hpp.in for comments
#pragma push_macro("VWR_OUTER_NAMESPACE")
#if defined(VWR_OUTER_NAMESPACE) #if defined(VWR_OUTER_NAMESPACE)
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
# undef VWR_OUTER_NAMESPACE # undef VWR_OUTER_NAMESPACE
#endif #endif
@ -30,7 +30,4 @@
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vector_cast.hpp" #include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vector_cast.hpp"
#undef VWR_OUTER_NAMESPACE #undef VWR_OUTER_NAMESPACE
#if defined(OLD_VWR_OUTER_NAMESPACE) #pragma pop_macro("VWR_OUTER_NAMESPACE")
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
# undef OLD_VWR_OUTER_NAMESPACE
#endif

7
cloonel_vectorwrapper/vectorops.hpp.in
View file

@ -21,8 +21,8 @@
//See vectorwrapper.hpp.in for comments //See vectorwrapper.hpp.in for comments
#pragma push_macro("VWR_OUTER_NAMESPACE")
#if defined(VWR_OUTER_NAMESPACE) #if defined(VWR_OUTER_NAMESPACE)
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
# undef VWR_OUTER_NAMESPACE # undef VWR_OUTER_NAMESPACE
#endif #endif
@ -30,7 +30,4 @@
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorops.hpp" #include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorops.hpp"
#undef VWR_OUTER_NAMESPACE #undef VWR_OUTER_NAMESPACE
#if defined(OLD_VWR_OUTER_NAMESPACE) #pragma pop_macro("VWR_OUTER_NAMESPACE")
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
# undef OLD_VWR_OUTER_NAMESPACE
#endif

7
cloonel_vectorwrapper/vectorwrapper.hpp.in
View file

@ -30,8 +30,8 @@
//absolute path here and forcing the outer namespace to cloonel this problem //absolute path here and forcing the outer namespace to cloonel this problem
//should be avoided. //should be avoided.
#pragma push_macro("VWR_OUTER_NAMESPACE")
#if defined(VWR_OUTER_NAMESPACE) #if defined(VWR_OUTER_NAMESPACE)
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
# undef VWR_OUTER_NAMESPACE # undef VWR_OUTER_NAMESPACE
#endif #endif
@ -39,7 +39,4 @@
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorwrapper.hpp" #include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorwrapper.hpp"
#undef VWR_OUTER_NAMESPACE #undef VWR_OUTER_NAMESPACE
#if defined(OLD_VWR_OUTER_NAMESPACE) #pragma pop_macro("VWR_OUTER_NAMESPACE")
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
# undef OLD_VWR_OUTER_NAMESPACE
#endif