|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r56159 - branches/release/boost
From: Alexander.Nasonov_at_[hidden]
Date: 2009-09-12 18:11:02
Author: nasonov
Date: 2009-09-12 18:11:01 EDT (Sat, 12 Sep 2009)
New Revision: 56159
URL: http://svn.boost.org/trac/boost/changeset/56159
Log:
[lexical_cast] Merge from trunk: r56158 (fix warning on MSVC warning level 4) and r53668 (avoid C style casts).
Text files modified:
branches/release/boost/lexical_cast.hpp | 47 +++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 24 deletions(-)
Modified: branches/release/boost/lexical_cast.hpp
==============================================================================
--- branches/release/boost/lexical_cast.hpp (original)
+++ branches/release/boost/lexical_cast.hpp 2009-09-12 18:11:01 EDT (Sat, 12 Sep 2009)
@@ -47,6 +47,13 @@
#define BOOST_LCAST_NO_WCHAR_T
#endif
+#ifdef BOOST_NO_TYPEID
+#define BOOST_LCAST_THROW_BAD_CAST(S, T) throw_exception(bad_lexical_cast())
+#else
+#define BOOST_LCAST_THROW_BAD_CAST(Source, Target) \
+ throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
+#endif
+
namespace boost
{
// exception used to indicate runtime lexical_cast failure
@@ -577,7 +584,7 @@
lexical_stream(char_type* = 0, char_type* = 0)
{
stream.unsetf(std::ios::skipws);
- lcast_set_precision(stream, (Source*)0, (Target*)0);
+ lcast_set_precision(stream, static_cast<Source*>(0), static_cast<Target*>(0) );
}
~lexical_stream()
{
@@ -694,7 +701,7 @@
{
this->setp(start, finish);
std::basic_ostream<CharT> stream(static_cast<Base*>(this));
- lcast_set_precision(stream, (OutputStreamable*)0);
+ lcast_set_precision(stream, static_cast<OutputStreamable*>(0));
bool const result = !(stream << input).fail();
finish = this->pptr();
return result;
@@ -764,7 +771,7 @@
this->setg(start, start, finish);
std::basic_istream<CharT> stream(static_cast<Base*>(this));
stream.unsetf(std::ios::skipws);
- lcast_set_precision(stream, (InputStreamable*)0);
+ lcast_set_precision(stream, static_cast<InputStreamable*>(0));
#if (defined _MSC_VER)
# pragma warning( pop )
#endif
@@ -1111,6 +1118,12 @@
typedef const T * type;
};
+#if (defined _MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4701 ) // possible use of ... before initialization
+# pragma warning( disable : 4702 ) // unreachable code
+#endif
+
template< typename Target
, typename Source
, bool Unlimited // string representation of Source is unlimited
@@ -1136,28 +1149,14 @@
, detail::lexical_stream_limited_src<CharT,base,traits>
>::type interpreter(buf, buf + src_len);
- // The original form, reproduced below, is more elegant
- // but yields a spurious C4701 warning ("possible use of
- // "result" before initialization") with VC7.1 (/W4).
-//
-// Target result;
-//
-// if(!(interpreter << arg && interpreter >> result))
-// throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)));
-// return result;
-
- if(interpreter << arg) {
- Target result;
- if (interpreter >> result)
- return result;
- }
-#ifndef BOOST_NO_TYPEID
- throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)));
-#else
- throw_exception(bad_lexical_cast());
-#endif
- return Target(); // normally never reached (throw_exception)
+ Target result;
+ if(!(interpreter << arg && interpreter >> result))
+ BOOST_LCAST_THROW_BAD_CAST(Source, Target);
+ return result;
}
+#if (defined _MSC_VER)
+# pragma warning( pop )
+#endif
}
template<typename Target, typename Source>
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