feedc0de/boost_conversion
1
0
Fork 0
forked from boostorg/conversion
Code Pull Requests Activity

Fix incorrect macro usage (refs #7799)

Browse Source 
[SVN r82017]
This commit is contained in:
Antony Polukhin
2012-12-16 09:01:18 +00:00
parent 2333ee53f8
commit 5a6309db7a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/lexical_cast.hpp
View File

@@ -151,7 +151,7 @@ namespace boost
#include <cmath> #include <cmath>
#include <istream> #include <istream>
#if !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY) #ifndef BOOST_NO_CXX11_HDR_ARRAY
#include <array> #include <array>
#endif #endif
@@ -294,7 +294,7 @@ namespace boost {
boost::detail::deduce_character_type_later< boost::array< const Char, N > > 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 > template < typename Char, std::size_t N >
struct stream_char_common< std::array<Char, N > >: public boost::mpl::if_c< struct stream_char_common< std::array<Char, N > >: public boost::mpl::if_c<
boost::detail::is_char_or_wchar< Char >::value, boost::detail::is_char_or_wchar< Char >::value,
@@ -308,7 +308,7 @@ namespace boost {
Char, Char,
boost::detail::deduce_character_type_later< std::array< const Char, N > > 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) #if !defined(BOOST_LCAST_NO_WCHAR_T) && defined(BOOST_NO_INTRINSIC_WCHAR_T)
template <> template <>
@@ -1768,7 +1768,7 @@ namespace boost {
bool operator<<(boost::array<const signed char, N> const& input) BOOST_NOEXCEPT bool operator<<(boost::array<const signed char, N> const& input) BOOST_NOEXCEPT
{ return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input)); } { 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> template <std::size_t N>
bool operator<<(std::array<CharT, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<CharT, N> const& input) BOOST_NOEXCEPT
{ return shl_char_array_limited(input.begin(), N); } { return shl_char_array_limited(input.begin(), N); }
@@ -1792,7 +1792,7 @@ namespace boost {
template <std::size_t N> template <std::size_t N>
bool operator<<(std::array<const signed char, N> const& input) BOOST_NOEXCEPT bool operator<<(std::array<const signed char, N> const& input) BOOST_NOEXCEPT
{ return ((*this) << reinterpret_cast<boost::array<const char, N> const& >(input)); } { 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> template <class InStreamable>
bool operator<<(const InStreamable& input) { return shl_input_streamable(input); } bool operator<<(const InStreamable& input) { return shl_input_streamable(input); }
@@ -2009,7 +2009,7 @@ namespace boost {
return ((*this) >> reinterpret_cast<boost::array<char, N>& >(output)); 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> template <std::size_t N>
bool operator>>(std::array<CharT, N>& output) BOOST_NOEXCEPT bool operator>>(std::array<CharT, N>& output) BOOST_NOEXCEPT
{ {
@@ -2023,11 +2023,11 @@ namespace boost {
} }
template <std::size_t N> 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)); return ((*this) >> reinterpret_cast<std::array<char, N>& >(output));
} }
#endif // !defined(BOOST_NO_CXX11_HDR_ARRAY) && defined(BOOST_HAS_TR1_ARRAY) #endif
/* /*

4
test/lexical_cast_arrays_test.cpp
View File

@@ -256,7 +256,7 @@ void testing_boost_array_output_conversion()
void testing_std_array_output_conversion() 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_char_value<std::array>();
testing_template_array_output_on_spec_value<std::array>(100); testing_template_array_output_on_spec_value<std::array>(100);
testing_template_array_output_on_spec_value<std::array>(static_cast<short>(100)); testing_template_array_output_on_spec_value<std::array>(static_cast<short>(100));
@@ -358,7 +358,7 @@ void testing_boost_array_input_conversion()
void testing_std_array_input_conversion() 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>(); testing_generic_array_input_conversion<std::array>();
#endif #endif

2
test/lexical_cast_stream_traits_test.cpp
View File

@@ -131,7 +131,7 @@ void test_metafunctions()
test_optimized_types_to_string_const<boost::iterator_range<const unsigned char*> >(); test_optimized_types_to_string_const<boost::iterator_range<const unsigned char*> >();
test_optimized_types_to_string_const<boost::iterator_range<const signed 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, 1> >();
test_optimized_types_to_string<std::array<char, 5> >(); test_optimized_types_to_string<std::array<char, 5> >();
test_optimized_types_to_string<std::array<unsigned char, 1> >(); test_optimized_types_to_string<std::array<unsigned char, 1> >();