boostorg/conversion
1
0
Fork 1
mirror of https://github.com/boostorg/conversion.git synced 2025-08-03 14:34:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6186 (lexical_cast compliation error fixed, when wchar_t is a typedef for unsigned short. Test added)

Browse Source 
[SVN r75864]
This commit is contained in:
Antony Polukhin
2011-12-08 15:29:44 +00:00
parent 2312691bde
commit a9697b88fd
3 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/lexical_cast.hpp
View File

@@ -1093,6 +1093,8 @@ namespace boost
namespace detail // optimized stream wrapper
{
struct type_used_as_workaround_for_typedefed_wchar_ts{};
// String representation of Source has an upper limit.
template< class CharT // a result of widest_char transformation
, class Traits // usually char_traits<CharT>
@@ -1354,6 +1356,8 @@ namespace boost
/************************************ HELPER FUNCTIONS FOR OPERATORS >> ( ... ) ********************************/
private:
bool shr_unsigned(type_used_as_workaround_for_typedefed_wchar_ts /*var*/) {return true;}
template <typename Type>
bool shr_unsigned(Type& output)
{
@@ -1480,8 +1484,15 @@ namespace boost
}
/************************************ OPERATORS >> ( ... ) ********************************/
public:
bool operator>>(unsigned short& output) { return shr_unsigned(output); }
typedef BOOST_DEDUCED_TYPENAME ::boost::mpl::if_c<
::boost::is_same<CharT, unsigned short>::value
, type_used_as_workaround_for_typedefed_wchar_ts
, unsigned short
>::type ushort_ambiguity_workaround;
public:
bool operator>>(ushort_ambiguity_workaround& output){ return shr_unsigned(output); }
bool operator>>(unsigned int& output) { return shr_unsigned(output); }
bool operator>>(unsigned long int& output) { return shr_unsigned(output); }
bool operator>>(short& output) { return shr_signed(output); }

7
test/Jamfile.v2
View File

@@ -14,7 +14,12 @@
# bring in rules for testing
import testing ;
import feature ;
feature.feature nowchar : on :
composite optional propagated link-incompatible ;
feature.compose <nowchar>on : <cxxflags>/Zc:wchar_t- ;
test-suite conversion
: [ run implicit_cast.cpp ]
[ compile-fail implicit_cast_fail.cpp ]
@@ -30,6 +35,6 @@ test-suite conversion
[ run lexical_cast_inf_nan_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
[ run lexical_cast_containers_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
[ run lexical_cast_empty_input_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
[ run lexical_cast_typedefed_wchar_test.cpp ../../test/build//boost_unit_test_framework/<link>static : : : <toolset>msvc:<nowchar>on : : ]
;

50
test/lexical_cast_typedefed_wchar_test.cpp Executable file
View File

@@ -0,0 +1,50 @@
// Unit test for boost::lexical_cast.
//
// See http://www.boost.org for most recent version, including documentation.
//
// Copyright Antony Polukhin, 2011.
//
// Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
#include <boost/config.hpp>
#if defined(__INTEL_COMPILER)
#pragma warning(disable: 193 383 488 981 1418 1419)
#elif defined(BOOST_MSVC)
#pragma warning(disable: 4097 4100 4121 4127 4146 4244 4245 4511 4512 4701 4800)
#endif
#include <boost/lexical_cast.hpp>
#include <boost/test/unit_test.hpp>
void test_typedefed_wchar_t();
using namespace boost;
unit_test::test_suite *init_unit_test_suite(int, char *[])
{
unit_test::test_suite *suite =
BOOST_TEST_SUITE("lexical_cast unit test for typedefed wchar_t (mainly for MSVC)");
suite->add(BOOST_TEST_CASE(&test_typedefed_wchar_t));
return suite;
}
void test_typedefed_wchar_t()
{
#ifdef BOOST_MSVC
BOOST_CHECK((boost::is_same<wchar_t, unsigned short>::value));
#endif
BOOST_CHECK_EQUAL(lexical_cast<int>(L"1000"), 1000);
}