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.
This commit is contained in:
King_DuckZ 2017-03-04 01:19:15 +00:00
parent 9533c73cd6
commit 33bc1e73da
6 changed files with 6 additions and 24 deletions

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef idFBC29C5127784D35BE62F7BAC16E3687 #pragma once
#define idFBC29C5127784D35BE62F7BAC16E3687
#define define_has_method(method_name,pretty_name) \ #define define_has_method(method_name,pretty_name) \
template <typename T> \ template <typename T> \
@ -50,5 +49,3 @@
public:\ public:\
enum { value = sizeof(has_enum<T>(nullptr)) == sizeof(TrueType) }; \ enum { value = sizeof(has_enum<T>(nullptr)) == sizeof(TrueType) }; \
} }
#endif

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef id4FAEF395B9ED47CB9D6B50B54C9A289A #pragma once
#define id4FAEF395B9ED47CB9D6B50B54C9A289A
#include <cstddef> #include <cstddef>
@ -57,5 +56,3 @@ namespace vwr {
#if defined VWR_OUTER_NAMESPACE #if defined VWR_OUTER_NAMESPACE
} //namespace VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE
#endif #endif
#endif

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef id85B9A9D5E08C4C97B0E3E69757C6AA54 #pragma once
#define id85B9A9D5E08C4C97B0E3E69757C6AA54
#include <cstddef> #include <cstddef>
#if defined(VWR_SIZE_TYPE) #if defined(VWR_SIZE_TYPE)
@ -37,5 +36,3 @@ namespace vwr {
#if defined VWR_OUTER_NAMESPACE #if defined VWR_OUTER_NAMESPACE
} //namespace VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE
#endif #endif
#endif

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef idE24EF7737A7F4882B2BF254F0A3EEC34 #pragma once
#define idE24EF7737A7F4882B2BF254F0A3EEC34
#include "vectorwrapper-1.0/sequence_bt.hpp" #include "vectorwrapper-1.0/sequence_bt.hpp"
#include "vectorwrapper-1.0/size_type.hpp" #include "vectorwrapper-1.0/size_type.hpp"
@ -50,5 +49,3 @@ namespace vwr {
#if defined VWR_OUTER_NAMESPACE #if defined VWR_OUTER_NAMESPACE
} //namespace VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE
#endif #endif
#endif

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef id8949C80C36BA42CABC49EA4C1DB54BC7 #pragma once
#define id8949C80C36BA42CABC49EA4C1DB54BC7
#include "vectorwrapper-1.0/vectorwrapper.hpp" #include "vectorwrapper-1.0/vectorwrapper.hpp"
#include "vectorwrapper-1.0/size_type.hpp" #include "vectorwrapper-1.0/size_type.hpp"
@ -61,5 +60,3 @@ namespace vwr {
#if defined VWR_OUTER_NAMESPACE #if defined VWR_OUTER_NAMESPACE
} //namespace VWR_OUTER_NAMESPACE } //namespace VWR_OUTER_NAMESPACE
#endif #endif
#endif

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef id1F562E68E5184552A7E8C9270B016692 #pragma once
#define id1F562E68E5184552A7E8C9270B016692
#include "vectorwrapper-1.0/has_method.hpp" #include "vectorwrapper-1.0/has_method.hpp"
#include "vectorwrapper-1.0/sequence_bt.hpp" #include "vectorwrapper-1.0/sequence_bt.hpp"
@ -494,5 +493,3 @@ namespace vwr {
#endif #endif
#include "vectorwrapper-1.0/vectorwrapper.inl" #include "vectorwrapper-1.0/vectorwrapper.inl"
#endif