boostorg/detail
1
0
Fork 1
mirror of https://github.com/boostorg/detail.git synced 2025-07-30 04:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of deprecated macros

Browse Source 
[SVN r81442]
This commit is contained in:
Marshall Clow
2012-11-20 19:44:24 +00:00
parent c77e8e89cf
commit dc1a439ec0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/detail/scoped_enum_emulation.hpp
View File

@ -11,7 +11,7 @@
[section:scoped_enums Scoped Enums] [section:scoped_enums Scoped Enums]
Generates C++0x scoped enums if the feature is present, otherwise emulates C++0x Generates C++0x scoped enums if the feature is present, otherwise emulates C++0x
scoped enums with C++03 namespaces and enums. The Boost.Config BOOST_NO_SCOPED_ENUMS scoped enums with C++03 namespaces and enums. The Boost.Config BOOST_NO_CXX11_SCOPED_ENUMS
macro is used to detect feature support. macro is used to detect feature support.
See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf for a See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf for a
@ -71,14 +71,14 @@ use
And instead of And instead of
#ifdef BOOST_NO_SCOPED_ENUMS #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
template <> template <>
struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc> : public true_type { }; struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc> : public true_type { };
#endif #endif
use use
#ifdef BOOST_NO_SCOPED_ENUMS #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
template <> template <>
struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc::enum_type > : public true_type { }; struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc::enum_type > : public true_type { };
#endif #endif
@ -130,7 +130,7 @@ Sample usage:
namespace boost namespace boost
{ {
#ifdef BOOST_NO_SCOPED_ENUMS #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
/** /**
* Meta-function to get the underlying type of a scoped enum. * Meta-function to get the underlying type of a scoped enum.
* *
@ -193,7 +193,7 @@ namespace boost
return e.native_value_(); return e.native_value_();
} }
#else // BOOST_NO_SCOPED_ENUMS #else // BOOST_NO_CXX11_SCOPED_ENUMS
template <typename EnumType> template <typename EnumType>
struct underlying_type struct underlying_type
@ -224,9 +224,9 @@ namespace boost
} }
#ifdef BOOST_NO_SCOPED_ENUMS #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS #ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#define BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR \ #define BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR \
explicit operator underlying_type() const { return get_underlying_value_(); } explicit operator underlying_type() const { return get_underlying_value_(); }
@ -305,7 +305,7 @@ namespace boost
*/ */
#define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) struct EnumType #define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) struct EnumType
#else // BOOST_NO_SCOPED_ENUMS #else // BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType,UnderlyingType) enum class EnumType:UnderlyingType #define BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType,UnderlyingType) enum class EnumType:UnderlyingType
#define BOOST_SCOPED_ENUM_DECLARE_BEGIN(EnumType) enum class EnumType #define BOOST_SCOPED_ENUM_DECLARE_BEGIN(EnumType) enum class EnumType
@ -315,13 +315,13 @@ namespace boost
#define BOOST_SCOPED_ENUM_NATIVE(EnumType) EnumType #define BOOST_SCOPED_ENUM_NATIVE(EnumType) EnumType
#define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) enum class EnumType #define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) enum class EnumType
#endif // BOOST_NO_SCOPED_ENUMS #endif // BOOST_NO_CXX11_SCOPED_ENUMS
#define BOOST_SCOPED_ENUM_START(name) BOOST_SCOPED_ENUM_DECLARE_BEGIN(name) #define BOOST_SCOPED_ENUM_START(name) BOOST_SCOPED_ENUM_DECLARE_BEGIN(name)
#define BOOST_SCOPED_ENUM_END BOOST_SCOPED_ENUM_DECLARE_END2() #define BOOST_SCOPED_ENUM_END BOOST_SCOPED_ENUM_DECLARE_END2()
#define BOOST_SCOPED_ENUM(name) BOOST_SCOPED_ENUM_NATIVE(name) #define BOOST_SCOPED_ENUM(name) BOOST_SCOPED_ENUM_NATIVE(name)
//#ifdef BOOST_NO_SCOPED_ENUMS //#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
// //
//# define BOOST_SCOPED_ENUM_START(name) struct name { enum enum_type //# define BOOST_SCOPED_ENUM_START(name) struct name { enum enum_type
//# define BOOST_SCOPED_ENUM_END }; //# define BOOST_SCOPED_ENUM_END };