|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73276 - in sandbox/enums/boost/enums: ordinal pp scoped
From: vicente.botet_at_[hidden]
Date: 2011-07-21 10:47:07
Author: viboes
Date: 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
New Revision: 73276
URL: http://svn.boost.org/trac/boost/changeset/73276
Log:
Enums: replace convert_to by explicit_convert_to
Text files modified:
sandbox/enums/boost/enums/ordinal/linear_traiter.hpp | 6 +++---
sandbox/enums/boost/enums/pp/enum_declaration.hpp | 8 ++++----
sandbox/enums/boost/enums/scoped/emulation.hpp | 24 ++++++++++++------------
sandbox/enums/boost/enums/scoped/enum_class_cons.hpp | 8 ++++----
sandbox/enums/boost/enums/scoped/enum_class_no_cons.hpp | 14 +++++++-------
sandbox/enums/boost/enums/scoped/enum_type_cons.hpp | 10 +++++-----
sandbox/enums/boost/enums/scoped/enum_type_no_cons.hpp | 14 +++++++-------
7 files changed, 42 insertions(+), 42 deletions(-)
Modified: sandbox/enums/boost/enums/ordinal/linear_traiter.hpp
==============================================================================
--- sandbox/enums/boost/enums/ordinal/linear_traiter.hpp (original)
+++ sandbox/enums/boost/enums/ordinal/linear_traiter.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -19,7 +19,7 @@
#include <boost/enums/ordinal/pos.hpp>
#include <boost/enums/ordinal/first.hpp>
#include <boost/enums/ordinal/last.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
/*!
@file
@@ -64,7 +64,7 @@
static EC val(std::size_t p)
{
typename underlying_type<EC>::type uv = p*step+first_value;
- return boost::conversion::convert_to<EC>(uv);
+ return boost::conversion::explicit_convert_to<EC>(uv);
}
};
@@ -81,7 +81,7 @@
// static EC val(std::size_t i)
// {
// typename underlying_type<EC>::type ut = 1<<i;
-// return boost::conversion::convert_to<EC>(ut);
+// return boost::conversion::explicit_convert_to<EC>(ut);
// }
// };
}
Modified: sandbox/enums/boost/enums/pp/enum_declaration.hpp
==============================================================================
--- sandbox/enums/boost/enums/pp/enum_declaration.hpp (original)
+++ sandbox/enums/boost/enums/pp/enum_declaration.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -34,7 +34,7 @@
BOOST_ENUMS_ENUMERATOR_DEFINITION_STR(ED) \
) == 0) \
{ \
- return boost::conversion::convert_to<ENUM>( \
+ return boost::conversion::explicit_convert_to<ENUM>( \
ENUM::BOOST_ENUMS_ENUMERATOR_DEFINITION_ID(ED) \
); \
}
@@ -46,7 +46,7 @@
#define BOOST_ENUMS_DCL_STRING_CONVERSIONS(ENUM, EL) \
inline \
- ENUM convert_to( \
+ ENUM explicit_convert_to( \
const char* str, \
boost::conversion::dummy::type_tag<ENUM> const& \
) \
@@ -61,12 +61,12 @@
} \
\
inline \
- ENUM convert_to( \
+ ENUM explicit_convert_to( \
const std::string& str, \
boost::conversion::dummy::type_tag<ENUM> const& \
) \
{ \
- return boost::conversion::convert_to<ENUM>( \
+ return boost::conversion::explicit_convert_to<ENUM>( \
str.c_str() \
); \
} \
Modified: sandbox/enums/boost/enums/scoped/emulation.hpp
==============================================================================
--- sandbox/enums/boost/enums/scoped/emulation.hpp (original)
+++ sandbox/enums/boost/enums/scoped/emulation.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -22,7 +22,7 @@
#include <boost/enums/scoped/native_value.hpp>
#include <boost/enums/scoped/underlying_value.hpp>
#include <boost/enums/scoped/is_enum.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
#include <boost/enums/pp/namespaces.hpp>
#include <cstring>
@@ -115,19 +115,19 @@
#define BOOST_ENUMS_DETAIL_FRIEND_CONVERSIONS(EC, UT) \
- inline EC convert_to(UT v \
+ inline EC explicit_convert_to(UT v \
, boost::conversion::dummy::type_tag<EC> const& \
) \
{ \
return EC(v); \
} \
- inline EC convert_to(boost::enums::native_type<EC>::type v \
+ inline EC explicit_convert_to(boost::enums::native_type<EC>::type v \
, boost::conversion::dummy::type_tag<EC> const& \
) \
{ \
return v; \
} \
- inline UT convert_to(EC v \
+ inline UT explicit_convert_to(EC v \
, boost::conversion::dummy::type_tag<UT> const& \
) \
{ \
@@ -155,25 +155,25 @@
#define BOOST_ENUMS_DETAIL_FRIEND_CONVERSIONS(EC, UT) \
- inline EC convert_to(UT v \
+ inline EC explicit_convert_to(UT v \
, boost::conversion::dummy::type_tag<EC> const& \
) \
{ \
- return EC::convert_to(v); \
+ return EC::explicit_convert_to(v); \
} \
- inline EC convert_to(boost::enums::native_type<EC>::type v \
+ inline EC explicit_convert_to(boost::enums::native_type<EC>::type v \
, boost::conversion::dummy::type_tag<EC> const& \
) \
{ \
- return EC::convert_to(v); \
+ return EC::explicit_convert_to(v); \
} \
- inline UT convert_to(EC v \
+ inline UT explicit_convert_to(EC v \
, boost::conversion::dummy::type_tag<UT> const& \
) \
{ \
return boost::enums::underlying_value(v); \
} \
- inline boost::enums::native_type<EC>::type convert_to(EC v \
+ inline boost::enums::native_type<EC>::type explicit_convert_to(EC v \
, boost::conversion::dummy::type_tag<boost::enums::native_type<EC>::type> const& \
) \
{ \
@@ -192,13 +192,13 @@
res.val_=static_cast<underlying_type>(EC::type()); \
return res; \
} \
- static EC convert_to(underlying_type v) \
+ static EC explicit_convert_to(underlying_type v) \
{ \
EC res; \
res.val_=v; \
return res; \
} \
- static EC convert_to(type v) \
+ static EC explicit_convert_to(type v) \
{ \
EC res; \
res.val_=static_cast<underlying_type>(v); \
Modified: sandbox/enums/boost/enums/scoped/enum_class_cons.hpp
==============================================================================
--- sandbox/enums/boost/enums/scoped/enum_class_cons.hpp (original)
+++ sandbox/enums/boost/enums/scoped/enum_class_cons.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -20,7 +20,7 @@
#define BOOST_ENUMS_SCOPED_ENUM_CLASS_CONS_HPP
#include <boost/config.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
#include <boost/enums/scoped/underlying_type.hpp>
#include <boost/enums/scoped/underlying_value.hpp>
#include <boost/enums/scoped/native_type.hpp>
@@ -44,7 +44,7 @@
//!
//! This class is not implicitly convertible to the underlying type,
//! neither to the enum type. Explicit conversion can be done using @c
- //! underlying_value<>(e), @c native_value<>(e) or the @c converto_to<>(e).
+ //! underlying_value<>(e), @c native_value<>(e) or the @c explicit_convert_to<>(e).
//! @Note This class can not be used inside a union with compilers that donesn't support unrestricted unions.
template <typename ScopedEnum, typename UT=int>
@@ -239,7 +239,7 @@
//! conversions from enum_class_cons to underlying_type following the Boost.Conversion protocol
//! @Returns <tt>boost::enums::underlying_value(v)</tt>.
- friend underlying_type convert_to(enum_class_cons v,
+ friend underlying_type explicit_convert_to(enum_class_cons v,
boost::conversion::dummy::type_tag<underlying_type> const&)
{
return boost::enums::underlying_value(v);
@@ -248,7 +248,7 @@
//! conversions from enum_class_cons to type following the Boost.Conversion protocol
//! @Returns <tt>boost::enums::native_value(v)</tt>.
- friend type convert_to(enum_class_cons v,
+ friend type explicit_convert_to(enum_class_cons v,
boost::conversion::dummy::type_tag<type> const&)
{
return boost::enums::native_value(v);
Modified: sandbox/enums/boost/enums/scoped/enum_class_no_cons.hpp
==============================================================================
--- sandbox/enums/boost/enums/scoped/enum_class_no_cons.hpp (original)
+++ sandbox/enums/boost/enums/scoped/enum_class_no_cons.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -20,7 +20,7 @@
#define BOOST_ENUMS_SCOPED_ENUM_CLASS_NO_CONS_HPP
#include <boost/config.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
#include <boost/enums/scoped/underlying_type.hpp>
#include <boost/enums/scoped/underlying_value.hpp>
#include <boost/enums/scoped/native_type.hpp>
@@ -68,7 +68,7 @@
return res;
}
- static enum_class_no_cons convert_to(underlying_type v)
+ static enum_class_no_cons explicit_convert_to(underlying_type v)
{
enum_class_no_cons res;
res.val_=v;
@@ -76,7 +76,7 @@
}
- static enum_class_no_cons convert_to(type v)
+ static enum_class_no_cons explicit_convert_to(type v)
{
enum_class_no_cons res;
res.val_=static_cast<underlying_type>(v);
@@ -187,7 +187,7 @@
}
//! conversions from underlying_type to enum_class_no_cons following the Boost.Conversion protocol
- friend enum_class_no_cons convert_to(underlying_type v,
+ friend enum_class_no_cons explicit_convert_to(underlying_type v,
boost::conversion::dummy::type_tag<enum_class_no_cons> const&)
{
enum_class_no_cons res;
@@ -196,7 +196,7 @@
}
//! friend conversions from type to enum_class_no_cons following the Boost.Conversion protocol
- friend enum_class_no_cons convert_to(type v,
+ friend enum_class_no_cons explicit_convert_to(type v,
boost::conversion::dummy::type_tag<enum_class_no_cons> const&)
{
enum_class_no_cons res;
@@ -205,14 +205,14 @@
}
//! conversions from enum_class_no_cons to underlying_type following the Boost.Conversion protocol
- friend underlying_type convert_to(enum_class_no_cons v,
+ friend underlying_type explicit_convert_to(enum_class_no_cons v,
boost::conversion::dummy::type_tag<underlying_type> const&)
{
return boost::enums::underlying_value(v);
}
//! conversions from enum_class_no_cons to type following the Boost.Conversion protocol
- friend type convert_to(enum_class_no_cons v,
+ friend type explicit_convert_to(enum_class_no_cons v,
boost::conversion::dummy::type_tag<type> const&)
{
return boost::enums::native_value(v);
Modified: sandbox/enums/boost/enums/scoped/enum_type_cons.hpp
==============================================================================
--- sandbox/enums/boost/enums/scoped/enum_type_cons.hpp (original)
+++ sandbox/enums/boost/enums/scoped/enum_type_cons.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -20,7 +20,7 @@
#define BOOST_ENUMS_SCOPED_ENUM_TYPE_CONS_HPP
#include <boost/config.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
#include <boost/enums/scoped/underlying_type.hpp>
#include <boost/enums/scoped/underlying_value.hpp>
#include <boost/enums/scoped/native_type.hpp>
@@ -92,7 +92,7 @@
return res;
}
- static enum_type_cons convert_to(underlying_type v)
+ static enum_type_cons explicit_convert_to(underlying_type v)
{
enum_type_cons res;
res.val_=v;
@@ -100,7 +100,7 @@
}
- static enum_type_cons convert_to(type v)
+ static enum_type_cons explicit_convert_to(type v)
{
enum_type_cons res;
res.val_=static_cast<underlying_type>(v);
@@ -120,13 +120,13 @@
}
//! conversions from enum_type_cons to underlying_type following the Boost.Conversion protocol
- friend underlying_type convert_to(enum_type_cons v,
+ friend underlying_type explicit_convert_to(enum_type_cons v,
boost::conversion::dummy::type_tag<underlying_type> const&)
{
return boost::enums::underlying_value(v);
}
//! conversions from enum_type_cons to type following the Boost.Conversion protocol
- friend type convert_to(enum_type_cons v,
+ friend type explicit_convert_to(enum_type_cons v,
boost::conversion::dummy::type_tag<type> const&)
{
return boost::enums::native_value(v);
Modified: sandbox/enums/boost/enums/scoped/enum_type_no_cons.hpp
==============================================================================
--- sandbox/enums/boost/enums/scoped/enum_type_no_cons.hpp (original)
+++ sandbox/enums/boost/enums/scoped/enum_type_no_cons.hpp 2011-07-21 10:47:06 EDT (Thu, 21 Jul 2011)
@@ -20,7 +20,7 @@
#define BOOST_ENUMS_SCOPED_ENUM_TYPE_NO_CONS_HPP
#include <boost/config.hpp>
-#include <boost/conversion/convert_to.hpp>
+#include <boost/conversion/explicit_convert_to.hpp>
#include <boost/enums/scoped/underlying_type.hpp>
#include <boost/enums/scoped/underlying_value.hpp>
#include <boost/enums/scoped/native_type.hpp>
@@ -75,7 +75,7 @@
return res;
}
- static enum_type_no_cons convert_to(underlying_type v)
+ static enum_type_no_cons explicit_convert_to(underlying_type v)
{
enum_type_no_cons res;
res.val_=v;
@@ -83,7 +83,7 @@
}
- static enum_type_no_cons convert_to(type v)
+ static enum_type_no_cons explicit_convert_to(type v)
{
enum_type_no_cons res;
res.val_=static_cast<underlying_type>(v);
@@ -102,7 +102,7 @@
//! conversions from underlying_type to enum_type_cons following the Boost.Conversion protocol
- friend enum_type_no_cons convert_to(underlying_type v,
+ friend enum_type_no_cons explicit_convert_to(underlying_type v,
boost::conversion::dummy::type_tag<enum_type_no_cons> const&)
{
enum_type_no_cons res;
@@ -111,7 +111,7 @@
}
//! friend conversions from type to enum_type_cons following the Boost.Conversion protocol
- friend enum_type_no_cons convert_to(type v,
+ friend enum_type_no_cons explicit_convert_to(type v,
boost::conversion::dummy::type_tag<enum_type_no_cons> const&)
{
enum_type_no_cons res;
@@ -120,14 +120,14 @@
}
//! conversions from enum_type_cons to underlying_type following the Boost.Conversion protocol
- friend underlying_type convert_to(enum_type_no_cons v,
+ friend underlying_type explicit_convert_to(enum_type_no_cons v,
boost::conversion::dummy::type_tag<underlying_type> const&)
{
return boost::enums::underlying_value(v);
}
//! conversions from enum_type_cons to type following the Boost.Conversion protocol
- friend type convert_to(enum_type_no_cons v,
+ friend type explicit_convert_to(enum_type_no_cons v,
boost::conversion::dummy::type_tag<type> const&)
{
return boost::enums::native_value(v);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk