Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r77117 - trunk/libs/conversion/test
From: antoshkka_at_[hidden]
Date: 2012-02-25 12:32:26


Author: apolukhin
Date: 2012-02-25 12:32:26 EST (Sat, 25 Feb 2012)
New Revision: 77117
URL: http://svn.boost.org/trac/boost/changeset/77117

Log:
Update for fixed #6441 (unable to compile lexical_cast with BOOST_NO_STD_LOCALE defined)
Now test must compile under VC, removed some warnings.
Text files modified:
   trunk/libs/conversion/test/Jamfile.v2 | 2 +-
   trunk/libs/conversion/test/lexical_cast_no_locale_test.cpp | 2 +-
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/libs/conversion/test/Jamfile.v2
==============================================================================
--- trunk/libs/conversion/test/Jamfile.v2 (original)
+++ trunk/libs/conversion/test/Jamfile.v2 2012-02-25 12:32:26 EST (Sat, 25 Feb 2012)
@@ -38,7 +38,7 @@
     [ run lexical_cast_pointers_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
     [ compile lexical_cast_typedefed_wchar_test.cpp : <toolset>msvc:<nowchar>on ]
     [ run lexical_cast_typedefed_wchar_test_runtime.cpp ../../test/build//boost_unit_test_framework/<link>static : : : <toolset>msvc:<nowchar>on ]
- [ run lexical_cast_no_locale_test.cpp ../../test/build//boost_unit_test_framework/<link>static : : : <define>BOOST_NO_STD_LOCALE ]
+ [ run lexical_cast_no_locale_test.cpp ../../test/build//boost_unit_test_framework/<link>static : : : <define>BOOST_NO_STD_LOCALE <define>BOOST_LEXICAL_CAST_ASSUME_C_LOCALE ]
     [ run lexical_cast_no_exceptions_test.cpp ../../test/build//boost_unit_test_framework/<link>static : : : <define>BOOST_NO_EXCEPTIONS ]
   ;
 #Add missing flags, when numeric_cast compilation with exceptions disabled will be fixed:

Modified: trunk/libs/conversion/test/lexical_cast_no_locale_test.cpp
==============================================================================
--- trunk/libs/conversion/test/lexical_cast_no_locale_test.cpp (original)
+++ trunk/libs/conversion/test/lexical_cast_no_locale_test.cpp 2012-02-25 12:32:26 EST (Sat, 25 Feb 2012)
@@ -113,7 +113,7 @@
     
     v = lexical_cast<Escape>(100);
     BOOST_CHECK_EQUAL(lexical_cast<int>(v), 100);
- BOOST_CHECK_EQUAL(lexical_cast<unsigned int>(v), 100);
+ BOOST_CHECK_EQUAL(lexical_cast<unsigned int>(v), 100u);
     
     v = lexical_cast<Escape>(0.0);
     BOOST_CHECK_EQUAL(lexical_cast<double>(v), 0.0);


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