mirror of https://github.com/CGAL/cgal
Rename all C++0x related config macros to consistently have CPP0X in their name,
as in CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.
This commit is contained in:
parent
75c24c79d8
commit
110a5db8be
|
|
@ -82,7 +82,7 @@ public:
|
||||||
: ep(c2e(o1), c2e(o2)), ap(c2a(o1), c2a(o2))
|
: ep(c2e(o1), c2e(o2)), ap(c2a(o1), c2a(o2))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
result_type
|
result_type
|
||||||
operator()(const Args&... args) const;
|
operator()(const Args&... args) const;
|
||||||
|
|
@ -145,7 +145,7 @@ public:
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
|
|
||||||
template <class EP, class AP, class C2E, class C2A, bool Protection>
|
template <class EP, class AP, class C2E, class C2A, bool Protection>
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
|
|
||||||
//| If a compiler does not support decltype() (from C++0x)
|
//| If a compiler does not support decltype() (from C++0x)
|
||||||
//| CGAL_CFG_NO_DECLTYPE is set.
|
//| CGAL_CFG_NO_CPP0X_DECLTYPE is set.
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
|
|
||||||
//| If a compiler does not support delegating constructors (from C++0x)
|
//| If a compiler does not support delegating constructors (from C++0x)
|
||||||
//| CGAL_CFG_NO_DELEGATING_CONSTRUCTORS is set.
|
//| CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS is set.
|
||||||
|
|
||||||
#undef NDEBUG
|
#undef NDEBUG
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
// ---------------------------------------------------------------------
|
// ---------------------------------------------------------------------
|
||||||
|
|
||||||
//| If a compiler does not support variadic templates (from C++0x)
|
//| If a compiler does not support variadic templates (from C++0x)
|
||||||
//| CGAL_CFG_NO_VARIADIC_TEMPLATES is set.
|
//| CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES is set.
|
||||||
|
|
||||||
#undef NDEBUG
|
#undef NDEBUG
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
#define CGAL_BEGIN_NAMESPACE namespace CGAL {
|
#define CGAL_BEGIN_NAMESPACE namespace CGAL {
|
||||||
#define CGAL_END_NAMESPACE }
|
#define CGAL_END_NAMESPACE }
|
||||||
|
|
||||||
#ifndef CGAL_CFG_NO_LONG_LONG
|
#ifndef CGAL_CFG_NO_CPP0X_LONG_LONG
|
||||||
# define CGAL_USE_LONG_LONG
|
# define CGAL_USE_LONG_LONG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,7 @@ public:
|
||||||
|
|
||||||
// Special insert methods that construct the objects in place
|
// Special insert methods that construct the objects in place
|
||||||
// (just forward the arguments to the constructor, to optimize a copy).
|
// (just forward the arguments to the constructor, to optimize a copy).
|
||||||
#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
template < typename... Args >
|
template < typename... Args >
|
||||||
iterator
|
iterator
|
||||||
emplace(const Args&... args)
|
emplace(const Args&... args)
|
||||||
|
|
@ -359,7 +359,7 @@ public:
|
||||||
++size_;
|
++size_;
|
||||||
return iterator(ret, 0);
|
return iterator(ret, 0);
|
||||||
}
|
}
|
||||||
#endif // CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#endif // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
|
|
||||||
iterator insert(const T &t)
|
iterator insert(const T &t)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ namespace CGALi {
|
||||||
// Hopefully C++0x will fix this properly with initializer_lists.
|
// Hopefully C++0x will fix this properly with initializer_lists.
|
||||||
// So, it's temporary, therefore I do not document it and keep it internal.
|
// So, it's temporary, therefore I do not document it and keep it internal.
|
||||||
|
|
||||||
#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
|
|
||||||
template< typename T, typename... Args >
|
template< typename T, typename... Args >
|
||||||
inline
|
inline
|
||||||
|
|
@ -52,7 +52,7 @@ make_array(const T & t, const Args & ... args)
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else // CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#else // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
|
|
||||||
template < typename T > inline
|
template < typename T > inline
|
||||||
boost::array<T, 1>
|
boost::array<T, 1>
|
||||||
|
|
@ -104,7 +104,7 @@ make_array(const T& b1, const T& b2, const T& b3, const T& b4, const T& b5,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // CGAL_CFG_NO_VARIADIC_TEMPLATES
|
#endif // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
|
||||||
|
|
||||||
} // namespace CGALi
|
} // namespace CGALi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue