[Boost-commit] svn:boost r85830 - trunk/boost

Subject: [Boost-commit] svn:boost r85830 - trunk/boost
From: antoshkka_at_[hidden]
Date: 2013-09-22 12:06:46

Author: apolukhin
Date: 2013-09-22 12:06:45 EDT (Sun, 22 Sep 2013)
New Revision: 85830
URL: http://svn.boost.org/trac/boost/changeset/85830

Log:
Minor update of lexical cast before fixing mingw issues (refs #9046)

Text files modified: 
   trunk/boost/lexical_cast.hpp |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/boost/lexical_cast.hpp
==============================================================================
--- trunk/boost/lexical_cast.hpp	Sun Sep 22 08:48:29 2013	(r85829)
+++ trunk/boost/lexical_cast.hpp	2013-09-22 12:06:45 EDT (Sun, 22 Sep 2013)	(r85830)
@@ -1524,7 +1524,7 @@
                     return true;
                 }
 
-                bool const result = shl_real_type(val, buffer, tmp_finish);
+                bool const result = shl_real_type(val, static_cast<CharT*>(buffer), tmp_finish);
                 finish = tmp_finish;
                 return result;
             }
@@ -2085,12 +2085,14 @@
                 Target result;
 
                 i_interpreter_type i_interpreter;
-                if (! (i_interpreter.operator <<(arg)))
-                    BOOST_LCAST_THROW_BAD_CAST(Source, Target);
+
+                // Disabling ADL, by directly specifying operators.
+                const bool input_ok = (i_interpreter.operator <<(arg));
 
                 o_interpreter_type out(i_interpreter.cbegin(), i_interpreter.cend());
+
                 // Disabling ADL, by directly specifying operators.
-                if(!(out.operator >>(result)))
+                if(!input_ok || !(out.operator >>(result)))
                   BOOST_LCAST_THROW_BAD_CAST(Source, Target);
 
                 return result;