Fix wrong macro usage.
This should work with both modern GCC and clang.
This commit is contained in:
parent
c30b4e430e
commit
8669e5e674
3 changed files with 6 additions and 15 deletions
|
@ -21,8 +21,8 @@
|
|||
|
||||
//See vectorwrapper.hpp.in for comments
|
||||
|
||||
#pragma push_macro("VWR_OUTER_NAMESPACE")
|
||||
#if defined(VWR_OUTER_NAMESPACE)
|
||||
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
|
||||
# undef VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
|
||||
|
@ -30,7 +30,4 @@
|
|||
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vector_cast.hpp"
|
||||
#undef VWR_OUTER_NAMESPACE
|
||||
|
||||
#if defined(OLD_VWR_OUTER_NAMESPACE)
|
||||
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
|
||||
# undef OLD_VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
#pragma pop_macro("VWR_OUTER_NAMESPACE")
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
//See vectorwrapper.hpp.in for comments
|
||||
|
||||
#pragma push_macro("VWR_OUTER_NAMESPACE")
|
||||
#if defined(VWR_OUTER_NAMESPACE)
|
||||
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
|
||||
# undef VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
|
||||
|
@ -30,7 +30,4 @@
|
|||
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorops.hpp"
|
||||
#undef VWR_OUTER_NAMESPACE
|
||||
|
||||
#if defined(OLD_VWR_OUTER_NAMESPACE)
|
||||
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
|
||||
# undef OLD_VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
#pragma pop_macro("VWR_OUTER_NAMESPACE")
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
//absolute path here and forcing the outer namespace to cloonel this problem
|
||||
//should be avoided.
|
||||
|
||||
#pragma push_macro("VWR_OUTER_NAMESPACE")
|
||||
#if defined(VWR_OUTER_NAMESPACE)
|
||||
# define OLD_VWR_OUTER_NAMESPACE VWR_OUTER_NAMESPACE
|
||||
# undef VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
|
||||
|
@ -39,7 +39,4 @@
|
|||
#include "@CMAKE_CURRENT_SOURCE_DIR@/../../lib/vectorwrapper/include/vectorwrapper/vectorwrapper.hpp"
|
||||
#undef VWR_OUTER_NAMESPACE
|
||||
|
||||
#if defined(OLD_VWR_OUTER_NAMESPACE)
|
||||
# define VWR_OUTER_NAMESPACE OLD_VWR_OUTER_NAMESPACE
|
||||
# undef OLD_VWR_OUTER_NAMESPACE
|
||||
#endif
|
||||
#pragma pop_macro("VWR_OUTER_NAMESPACE")
|
||||
|
|
Loading…
Reference in a new issue