Merged from trunk

[SVN r18237]
This commit is contained in:
Terje Slettebø
2003-04-11 22:15:04 +00:00
parent 6e077f97fc
commit fdd5ca3353

View File

@@ -18,6 +18,7 @@
#include <typeinfo>
#include <boost/config.hpp>
#include <boost/limits.hpp>
#include <boost/throw_exception.hpp>
#include <boost/type_traits/is_pointer.hpp>
#ifdef BOOST_NO_STRINGSTREAM
@@ -29,50 +30,46 @@
#if defined(BOOST_NO_STRINGSTREAM) || \
defined(BOOST_NO_STD_WSTRING) || \
defined(BOOST_NO_STD_LOCALE) || \
defined(BOOST_NO_CWCHAR) || \
defined(BOOST_MSVC) && (BOOST_MSVC <= 1200)
defined(BOOST_NO_INTRINSIC_WCHAR_T)
#define DISABLE_WIDE_CHAR_SUPPORT
#endif
#ifdef BOOST_NO_INTRINSIC_WCHAR_T
#include <cwchar>
#endif
namespace boost
{
// exception used to indicate runtime lexical_cast failure
class bad_lexical_cast : public std::bad_cast
{
public:
virtual ~bad_lexical_cast() throw()
bad_lexical_cast() :
source(&typeid(void)), target(&typeid(void))
{
}
};
namespace detail // actual underlying concrete exception type
{
template<typename Target, typename Source>
class no_lexical_conversion : public bad_lexical_cast
{
public:
no_lexical_conversion()
: description(
std::string() + "bad lexical cast: " +
"source type value could not be interpreted as target, Target=" +
typeid(Target).name() + ", Source=" + typeid(Source).name())
bad_lexical_cast(
const std::type_info &s,
const std::type_info &t) :
source(&s), target(&t)
{
}
virtual ~no_lexical_conversion() throw()
const std::type_info &source_type() const
{
return *source;
}
const std::type_info &target_type() const
{
return *target;
}
virtual const char *what() const throw()
{
return description.c_str();
return "bad lexical cast: "
"source type value could not be interpreted as target";
}
virtual ~bad_lexical_cast() throw()
{
}
private:
const std::string description; // static initialization fails on MSVC6
const std::type_info *source;
const std::type_info *target;
};
}
namespace detail // selectors for choosing stream character type
{
@@ -144,7 +141,7 @@ namespace boost
}
bool operator<<(const Source &input)
{
return stream << input;
return !(stream << input).fail();
}
template<typename InputStreamable>
bool operator>>(InputStreamable &output)
@@ -190,7 +187,7 @@ namespace boost
Target result;
if(!(interpreter << arg && interpreter >> result))
throw detail::no_lexical_conversion<Target, Source>();
throw_exception(detail::no_lexical_conversion<Target, Source>());
return result;
}
}
@@ -205,3 +202,4 @@ namespace boost
#undef DISABLE_WIDE_CHAR_SUPPORT
#endif