From e53e59e4ff48bb6c217d074f27f42f6a185b5c73 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Sat, 4 Mar 2017 00:33:54 +0000 Subject: [PATCH] Impose cloonel as the outer namespace for vwr. This is needed when cloonelgraphics is used outside of clooneljump project. --- src/cloonelgraphics/vectypes.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/cloonelgraphics/vectypes.hpp b/src/cloonelgraphics/vectypes.hpp index 2cf1981..876f7ab 100644 --- a/src/cloonelgraphics/vectypes.hpp +++ b/src/cloonelgraphics/vectypes.hpp @@ -20,6 +20,13 @@ #ifndef id7155F721B70C41B383896327C7D07E30 #define id7155F721B70C41B383896327C7D07E30 +#if defined(VWR_OUTER_NAMESPACE) +# define CLOONEL_OUTER_NAMESPACE_WAS_DEFINED +# pragma push_macro("VWR_OUTER_NAMESPACE") +# undef VWR_OUTER_NAMESPACE +#endif +#define VWR_OUTER_NAMESPACE cloonel + #include "vectorwrapper/vectorwrapper.hpp" #include "vectorwrapper/vector_cast.hpp" #include "compatibility.h" @@ -81,4 +88,11 @@ namespace cloonel { #undef SPECIALIZE_ARRAY_VECTOR +#if defined(CLOONEL_OUTER_NAMESPACE_WAS_DEFINED) +# undef CLOONEL_OUTER_NAMESPACE_WAS_DEFINED +# pragma pop_macro("VWR_OUTER_NAMESPACE") +#else +# undef VWR_OUTER_NAMESPACE +#endif + #endif