[Boost-commit] svn:boost r82017 - in trunk: boost libs/conversion/test

Subject: [Boost-commit] svn:boost r82017 - in trunk: boost libs/conversion/test
From: antoshkka_at_[hidden]
Date: 2012-12-16 04:01:19

Author: apolukhin
Date: 2012-12-16 04:01:18 EST (Sun, 16 Dec 2012)
New Revision: 82017
URL: http://svn.boost.org/trac/boost/changeset/82017

Log:
Fix incorrect macro usage (refs #7799)
Text files modified: 
   trunk/boost/lexical_cast.hpp                                   |    16 ++++++++--------                        
   trunk/libs/conversion/test/lexical_cast_arrays_test.cpp        |     4 ++--                                    
   trunk/libs/conversion/test/lexical_cast_stream_traits_test.cpp |     2 +-                                      
   3 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/lexical_cast.hpp
==============================================================================
--- trunk/boost/lexical_cast.hpp	(original)
+++ trunk/boost/lexical_cast.hpp	2012-12-16 04:01:18 EST (Sun, 16 Dec 2012)
@@ -151,7 +151,7 @@
 #include <cmath>
 #include <istream>
 
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
 #include <array>
 #endif
 
@@ -294,7 +294,7 @@
             boost::detail::deduce_character_type_later< boost::array< const Char, N > >
         > {};
 
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
         template < typename Char, std::size_t N >
         struct stream_char_common< std::array<Char, N > >: public boost::mpl::if_c<
             boost::detail::is_char_or_wchar< Char >::value,
@@ -308,7 +308,7 @@
             Char,
             boost::detail::deduce_character_type_later< std::array< const Char, N > >
         > {};
-#endif // !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#endif
 
 #if !defined(BOOST_LCAST_NO_WCHAR_T) && defined(BOOST_NO_INTRINSIC_WCHAR_T)
         template <>
@@ -1768,7 +1768,7 @@
             bool operator<<(boost::array<const signed char, N> const& input) BOOST_NOEXCEPT
             { return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input)); }
  
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
             template <std::size_t N>
             bool operator<<(std::array<CharT, N> const& input) BOOST_NOEXCEPT
             { return shl_char_array_limited(input.begin(), N); }
@@ -1792,7 +1792,7 @@
             template <std::size_t N>
             bool operator<<(std::array<const signed char, N> const& input) BOOST_NOEXCEPT
             { return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input)); }
-#endif // !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#endif
             
             template <class InStreamable>
             bool operator<<(const InStreamable& input)  { return shl_input_streamable(input); }
@@ -2009,7 +2009,7 @@
                 return ((*this) >> reinterpret_cast<boost::array<char, N>& >(output)); 
             }
  
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
             template <std::size_t N>
             bool operator>>(std::array<CharT, N>& output) BOOST_NOEXCEPT
             { 
@@ -2023,11 +2023,11 @@
             }
 
             template <std::size_t N>
-            bool operator>>(std::array<signed char, N>& in)   
+            bool operator>>(std::array<signed char, N>& output)
             { 
                 return ((*this) >> reinterpret_cast<std::array<char, N>& >(output)); 
             }
-#endif // !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#endif
 
 
             /*

Modified: trunk/libs/conversion/test/lexical_cast_arrays_test.cpp
==============================================================================
--- trunk/libs/conversion/test/lexical_cast_arrays_test.cpp	(original)
+++ trunk/libs/conversion/test/lexical_cast_arrays_test.cpp	2012-12-16 04:01:18 EST (Sun, 16 Dec 2012)
@@ -256,7 +256,7 @@
 
 void testing_std_array_output_conversion()
 {
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
     testing_template_array_output_on_char_value<std::array>();
     testing_template_array_output_on_spec_value<std::array>(100);
     testing_template_array_output_on_spec_value<std::array>(static_cast<short>(100));
@@ -358,7 +358,7 @@
 
 void testing_std_array_input_conversion()
 {
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
     testing_generic_array_input_conversion<std::array>();
 #endif
 

Modified: trunk/libs/conversion/test/lexical_cast_stream_traits_test.cpp
==============================================================================
--- trunk/libs/conversion/test/lexical_cast_stream_traits_test.cpp	(original)
+++ trunk/libs/conversion/test/lexical_cast_stream_traits_test.cpp	2012-12-16 04:01:18 EST (Sun, 16 Dec 2012)
@@ -131,7 +131,7 @@
     test_optimized_types_to_string_const<boost::iterator_range<const unsigned char*> >();
     test_optimized_types_to_string_const<boost::iterator_range<const signed char*> >();
 
-#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY)
+#ifndef BOOST_NO_CXX11_HDR_ARRAY
     test_optimized_types_to_string<std::array<char, 1> >();
     test_optimized_types_to_string<std::array<char, 5> >();
     test_optimized_types_to_string<std::array<unsigned char, 1> >();