Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81551 - trunk/boost
From: marshall_at_[hidden]
Date: 2012-11-26 09:14:11


Author: marshall
Date: 2012-11-26 09:14:10 EST (Mon, 26 Nov 2012)
New Revision: 81551
URL: http://svn.boost.org/trac/boost/changeset/81551

Log:
Remove usage of deprecated macros
Text files modified:
   trunk/boost/lexical_cast.hpp | 28 ++++++++++++++--------------
   1 files changed, 14 insertions(+), 14 deletions(-)

Modified: trunk/boost/lexical_cast.hpp
==============================================================================
--- trunk/boost/lexical_cast.hpp (original)
+++ trunk/boost/lexical_cast.hpp 2012-11-26 09:14:10 EST (Mon, 26 Nov 2012)
@@ -112,7 +112,7 @@
             return *target;
         }
 
-#ifndef BOOST_NO_NOEXCEPT
+#ifndef BOOST_NO_CXX11_NOEXCEPT
         virtual const char *what() const noexcept
 #else
         virtual const char *what() const throw()
@@ -122,7 +122,7 @@
                    "source type value could not be interpreted as target";
         }
 
-#ifndef BOOST_NO_NOEXCEPT
+#ifndef BOOST_NO_CXX11_NOEXCEPT
         virtual ~bad_lexical_cast() BOOST_NOEXCEPT
 #else
         virtual ~bad_lexical_cast() throw()
@@ -185,10 +185,10 @@
                     #ifndef BOOST_LCAST_NO_WCHAR_T
                         boost::is_same< T, wchar_t >::value,
                     #endif
- #ifndef BOOST_NO_CHAR16_T
+ #ifndef BOOST_NO_CXX11_CHAR16_T
                         boost::is_same< T, char16_t >::value,
                     #endif
- #ifndef BOOST_NO_CHAR32_T
+ #ifndef BOOST_NO_CXX11_CHAR32_T
                         boost::is_same< T, char32_t >::value,
                     #endif
                     boost::is_same< T, unsigned char >::value,
@@ -667,12 +667,12 @@
                 target_char_t, src_char_t
>::type char_type;
 
-#if !defined(BOOST_NO_CHAR16_T) && defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR16_T) && defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             BOOST_STATIC_ASSERT_MSG(( !boost::is_same<char16_t, src_char_t>::value
                                         && !boost::is_same<char16_t, target_char_t>::value),
                 "Your compiler does not have full support for char16_t" );
 #endif
-#if !defined(BOOST_NO_CHAR32_T) && defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR32_T) && defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             BOOST_STATIC_ASSERT_MSG(( !boost::is_same<char32_t, src_char_t>::value
                                         && !boost::is_same<char32_t, target_char_t>::value),
                 "Your compiler does not have full support for char32_t" );
@@ -738,7 +738,7 @@
         };
 #endif
 
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
         template<>
         struct lcast_char_constants<char16_t>
         {
@@ -751,7 +751,7 @@
         };
 #endif
 
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
         template<>
         struct lcast_char_constants<char32_t>
         {
@@ -1101,7 +1101,7 @@
         }
 
 #endif
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
         template <class T>
         bool parse_inf_nan(const char16_t* begin, const char16_t* end, T& value) BOOST_NOEXCEPT
         {
@@ -1117,7 +1117,7 @@
             return put_inf_nan_impl(begin, end, value, u"nan", u"infinity");
         }
 #endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
         template <class T>
         bool parse_inf_nan(const char32_t* begin, const char32_t* end, T& value) BOOST_NOEXCEPT
         {
@@ -1704,12 +1704,12 @@
             bool operator<<(wchar_t ch) { return shl_char(ch); }
 #endif
 #endif
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             bool operator<<(char16_t ch) { return shl_char(ch); }
             bool operator<<(char16_t * str) { return shl_char_array(str); }
             bool operator<<(char16_t const * str) { return shl_char_array(str); }
 #endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             bool operator<<(char32_t ch) { return shl_char(ch); }
             bool operator<<(char32_t * str) { return shl_char_array(str); }
             bool operator<<(char32_t const * str) { return shl_char_array(str); }
@@ -1961,10 +1961,10 @@
 #if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
             bool operator>>(wchar_t& output) { return shr_xchar(output); }
 #endif
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             bool operator>>(char16_t& output) { return shr_xchar(output); }
 #endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
             bool operator>>(char32_t& output) { return shr_xchar(output); }
 #endif
             template<class Alloc>


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