From 33bc1e73da50669c3e5bdef130079847a74372d4 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Sat, 4 Mar 2017 01:19:15 +0000 Subject: [PATCH] Use pragma once instead of inclusion guards. Multiple versions of the same library can't be used in the same project because even tho project take care to include from the right vectorwrapper-1.0/ dir the inclusion guard is the same. So in spite of having a different path and livingi in a different namespace, ifndef is preventing the inclusions to work. --- include/vectorwrapper/has_method.hpp | 5 +---- include/vectorwrapper/sequence_bt.hpp | 5 +---- include/vectorwrapper/size_type.hpp | 5 +---- include/vectorwrapper/vector_cast.hpp | 5 +---- include/vectorwrapper/vectorops.hpp | 5 +---- include/vectorwrapper/vectorwrapper.hpp | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/include/vectorwrapper/has_method.hpp b/include/vectorwrapper/has_method.hpp index 9fc57d2..1c2f4a7 100644 --- a/include/vectorwrapper/has_method.hpp +++ b/include/vectorwrapper/has_method.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef idFBC29C5127784D35BE62F7BAC16E3687 -#define idFBC29C5127784D35BE62F7BAC16E3687 +#pragma once #define define_has_method(method_name,pretty_name) \ template \ @@ -50,5 +49,3 @@ public:\ enum { value = sizeof(has_enum(nullptr)) == sizeof(TrueType) }; \ } - -#endif diff --git a/include/vectorwrapper/sequence_bt.hpp b/include/vectorwrapper/sequence_bt.hpp index 8ba2cc8..4a753ef 100644 --- a/include/vectorwrapper/sequence_bt.hpp +++ b/include/vectorwrapper/sequence_bt.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef id4FAEF395B9ED47CB9D6B50B54C9A289A -#define id4FAEF395B9ED47CB9D6B50B54C9A289A +#pragma once #include @@ -57,5 +56,3 @@ namespace vwr { #if defined VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE #endif - -#endif diff --git a/include/vectorwrapper/size_type.hpp b/include/vectorwrapper/size_type.hpp index 7e51705..bf8190a 100644 --- a/include/vectorwrapper/size_type.hpp +++ b/include/vectorwrapper/size_type.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef id85B9A9D5E08C4C97B0E3E69757C6AA54 -#define id85B9A9D5E08C4C97B0E3E69757C6AA54 +#pragma once #include #if defined(VWR_SIZE_TYPE) @@ -37,5 +36,3 @@ namespace vwr { #if defined VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE #endif - -#endif diff --git a/include/vectorwrapper/vector_cast.hpp b/include/vectorwrapper/vector_cast.hpp index 0a79037..e17f127 100644 --- a/include/vectorwrapper/vector_cast.hpp +++ b/include/vectorwrapper/vector_cast.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef idE24EF7737A7F4882B2BF254F0A3EEC34 -#define idE24EF7737A7F4882B2BF254F0A3EEC34 +#pragma once #include "vectorwrapper-1.0/sequence_bt.hpp" #include "vectorwrapper-1.0/size_type.hpp" @@ -50,5 +49,3 @@ namespace vwr { #if defined VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE #endif - -#endif diff --git a/include/vectorwrapper/vectorops.hpp b/include/vectorwrapper/vectorops.hpp index d0c3424..53ea3d6 100644 --- a/include/vectorwrapper/vectorops.hpp +++ b/include/vectorwrapper/vectorops.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef id8949C80C36BA42CABC49EA4C1DB54BC7 -#define id8949C80C36BA42CABC49EA4C1DB54BC7 +#pragma once #include "vectorwrapper-1.0/vectorwrapper.hpp" #include "vectorwrapper-1.0/size_type.hpp" @@ -61,5 +60,3 @@ namespace vwr { #if defined VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE #endif - -#endif diff --git a/include/vectorwrapper/vectorwrapper.hpp b/include/vectorwrapper/vectorwrapper.hpp index f4e3b05..ad19c6b 100644 --- a/include/vectorwrapper/vectorwrapper.hpp +++ b/include/vectorwrapper/vectorwrapper.hpp @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef id1F562E68E5184552A7E8C9270B016692 -#define id1F562E68E5184552A7E8C9270B016692 +#pragma once #include "vectorwrapper-1.0/has_method.hpp" #include "vectorwrapper-1.0/sequence_bt.hpp" @@ -494,5 +493,3 @@ namespace vwr { #endif #include "vectorwrapper-1.0/vectorwrapper.inl" - -#endif