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

Merge lexical_cast from trunk :

Browse Source 
* force SunCC compiler to use fallback version of lexical_cast (with fallbak version SunCC can pass at least some tests)
* removed trailing whitespaces

[SVN r78565]
This commit is contained in:
Antony Polukhin
2012-05-24 04:22:04 +00:00
parent ca9c8d30bd
commit 79d6468aeb
11 changed files with 90 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/lexical_cast.hpp
View File

@@ -134,7 +134,7 @@ namespace boost
} }
} // namespace boost } // namespace boost
#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(__SUNPRO_CC)
#include <cmath> #include <cmath>
#include <istream> #include <istream>
@@ -147,9 +147,7 @@ namespace boost
#include <boost/math/special_functions/sign.hpp> #include <boost/math/special_functions/sign.hpp>
#include <boost/math/special_functions/fpclassify.hpp> #include <boost/math/special_functions/fpclassify.hpp>
#include <boost/range/iterator_range_core.hpp> #include <boost/range/iterator_range_core.hpp>
#if !defined(__SUNPRO_CC)
#include <boost/container/container_fwd.hpp> #include <boost/container/container_fwd.hpp>
#endif // !defined(__SUNPRO_CC)
#ifndef BOOST_NO_CWCHAR #ifndef BOOST_NO_CWCHAR
# include <cwchar> # include <cwchar>
#endif #endif
@@ -256,13 +254,11 @@ namespace boost {
typedef CharT type; typedef CharT type;
}; };
#if !defined(__SUNPRO_CC)
template<class CharT, class Traits, class Alloc> template<class CharT, class Traits, class Alloc>
struct stream_char< ::boost::container::basic_string<CharT, Traits, Alloc> > struct stream_char< ::boost::container::basic_string<CharT, Traits, Alloc> >
{ {
typedef CharT type; typedef CharT type;
}; };
#endif // !defined(__SUNPRO_CC)
#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<>
@@ -312,7 +308,6 @@ namespace boost {
typedef Traits type; typedef Traits type;
}; };
#if !defined(__SUNPRO_CC)
template<class CharT, class Traits, class Alloc, class Source> template<class CharT, class Traits, class Alloc, class Source>
struct deduce_char_traits< CharT struct deduce_char_traits< CharT
, ::boost::container::basic_string<CharT,Traits,Alloc> , ::boost::container::basic_string<CharT,Traits,Alloc>
@@ -366,7 +361,6 @@ namespace boost {
{ {
typedef Traits type; typedef Traits type;
}; };
#endif // !defined(__SUNPRO_CC)
} }
namespace detail // lcast_src_length namespace detail // lcast_src_length
@@ -1389,7 +1383,6 @@ namespace boost {
return true; return true;
} }
#if !defined(__SUNPRO_CC)
template<class Alloc> template<class Alloc>
bool operator<<(::boost::container::basic_string<CharT,Traits,Alloc> const& str) bool operator<<(::boost::container::basic_string<CharT,Traits,Alloc> const& str)
{ {
@@ -1397,7 +1390,7 @@ namespace boost {
finish = start + str.length(); finish = start + str.length();
return true; return true;
} }
#endif // !defined(__SUNPRO_CC)
bool operator<<(bool value) bool operator<<(bool value)
{ {
CharT const czero = lcast_char_constants<CharT>::zero; CharT const czero = lcast_char_constants<CharT>::zero;
@@ -1677,10 +1670,9 @@ namespace boost {
#endif #endif
template<class Alloc> template<class Alloc>
bool operator>>(std::basic_string<CharT,Traits,Alloc>& str) { str.assign(start, finish); return true; } bool operator>>(std::basic_string<CharT,Traits,Alloc>& str) { str.assign(start, finish); return true; }
#if !defined(__SUNPRO_CC)
template<class Alloc> template<class Alloc>
bool operator>>(::boost::container::basic_string<CharT,Traits,Alloc>& str) { str.assign(start, finish); return true; } bool operator>>(::boost::container::basic_string<CharT,Traits,Alloc>& str) { str.assign(start, finish); return true; }
#endif // !defined(__SUNPRO_CC)
/* /*
* case "-0" || "0" || "+0" : output = false; return true; * case "-0" || "0" || "+0" : output = false; return true;
@@ -1812,13 +1804,12 @@ namespace boost {
{ {
BOOST_STATIC_CONSTANT(bool, value = true ); BOOST_STATIC_CONSTANT(bool, value = true );
}; };
#if !defined(__SUNPRO_CC)
template<typename CharT, typename Traits, typename Alloc> template<typename CharT, typename Traits, typename Alloc>
struct is_stdstring< ::boost::container::basic_string<CharT, Traits, Alloc> > struct is_stdstring< ::boost::container::basic_string<CharT, Traits, Alloc> >
{ {
BOOST_STATIC_CONSTANT(bool, value = true ); BOOST_STATIC_CONSTANT(bool, value = true );
}; };
#endif // !defined(__SUNPRO_CC)
template<typename Target, typename Source> template<typename Target, typename Source>
struct is_arithmetic_and_not_xchars struct is_arithmetic_and_not_xchars
@@ -1904,7 +1895,7 @@ namespace boost {
{ {
BOOST_STATIC_CONSTANT(bool, value = true ); BOOST_STATIC_CONSTANT(bool, value = true );
}; };
#if !defined(__SUNPRO_CC)
template<typename CharT, typename Traits, typename Alloc> template<typename CharT, typename Traits, typename Alloc>
struct is_char_array_to_stdstring< ::boost::container::basic_string<CharT, Traits, Alloc>, CharT* > struct is_char_array_to_stdstring< ::boost::container::basic_string<CharT, Traits, Alloc>, CharT* >
{ {
@@ -1916,7 +1907,6 @@ namespace boost {
{ {
BOOST_STATIC_CONSTANT(bool, value = true ); BOOST_STATIC_CONSTANT(bool, value = true );
}; };
#endif // !defined(__SUNPRO_CC)
#if (defined _MSC_VER) #if (defined _MSC_VER)
# pragma warning( push ) # pragma warning( push )