feedc0de/boost_conversion
1
0
Fork 0
forked from boostorg/conversion
Code Pull Requests Activity

Removed usage of deprecated macros

Browse Source 
[SVN r81559]
This commit is contained in:
Marshall Clow
2012-11-26 17:27:53 +00:00
parent 82969ebb20
commit e15f179bfc
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lexical_cast_test.cpp
View File

@@ -82,10 +82,10 @@ void test_wallocator();
#endif #endif
void test_char_types_conversions(); void test_char_types_conversions();
void operators_overload_test(); void operators_overload_test();
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
void test_char16_conversions(); void test_char16_conversions();
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
void test_char32_conversions(); void test_char32_conversions();
#endif #endif
void test_getting_pointer_to_function(); void test_getting_pointer_to_function();
@@ -120,10 +120,10 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])
suite->add(BOOST_TEST_CASE(&test_char_types_conversions)); suite->add(BOOST_TEST_CASE(&test_char_types_conversions));
suite->add(BOOST_TEST_CASE(&operators_overload_test)); suite->add(BOOST_TEST_CASE(&operators_overload_test));
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
suite->add(BOOST_TEST_CASE(&test_char16_conversions)); suite->add(BOOST_TEST_CASE(&test_char16_conversions));
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
suite->add(BOOST_TEST_CASE(&test_char32_conversions)); suite->add(BOOST_TEST_CASE(&test_char32_conversions));
#endif #endif
suite->add(BOOST_TEST_CASE(&test_getting_pointer_to_function)); suite->add(BOOST_TEST_CASE(&test_getting_pointer_to_function));
@@ -591,7 +591,7 @@ void operators_overload_test()
} }
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
void test_char16_conversions() void test_char16_conversions()
{ {
BOOST_CHECK(u"100" == lexical_cast<std::u16string>(u"100")); BOOST_CHECK(u"100" == lexical_cast<std::u16string>(u"100"));
@@ -599,7 +599,7 @@ void test_char16_conversions()
} }
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
void test_char32_conversions() void test_char32_conversions()
{ {
BOOST_CHECK(U"100" == lexical_cast<std::u32string>(U"100")); BOOST_CHECK(U"100" == lexical_cast<std::u32string>(U"100"));

12
test/lexical_cast_arrays_test.cpp
View File

@@ -91,7 +91,7 @@ static void testing_template_array_output_on_spec_value(T val)
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef ArrayT<char16_t, 300> u16arr_type; typedef ArrayT<char16_t, 300> u16arr_type;
typedef ArrayT<char16_t, 3> u16short_arr_type; typedef ArrayT<char16_t, 3> u16short_arr_type;
std::u16string u16ethalon(u"100"); std::u16string u16ethalon(u"100");
@@ -109,7 +109,7 @@ static void testing_template_array_output_on_spec_value(T val)
BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast);
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef ArrayT<char32_t, 300> u32arr_type; typedef ArrayT<char32_t, 300> u32arr_type;
typedef ArrayT<char32_t, 3> u32short_arr_type; typedef ArrayT<char32_t, 3> u32short_arr_type;
std::u32string u32ethalon(U"100"); std::u32string u32ethalon(U"100");
@@ -190,7 +190,7 @@ static void testing_template_array_output_on_char_value()
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef ArrayT<char16_t, 300> u16arr_type; typedef ArrayT<char16_t, 300> u16arr_type;
typedef ArrayT<char16_t, 3> u16short_arr_type; typedef ArrayT<char16_t, 3> u16short_arr_type;
std::u16string u16ethalon(u"100"); std::u16string u16ethalon(u"100");
@@ -217,7 +217,7 @@ static void testing_template_array_output_on_char_value()
BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast);
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef ArrayT<char32_t, 300> u32arr_type; typedef ArrayT<char32_t, 300> u32arr_type;
typedef ArrayT<char32_t, 3> u32short_arr_type; typedef ArrayT<char32_t, 3> u32short_arr_type;
std::u32string u32ethalon(U"100"); std::u32string u32ethalon(U"100");
@@ -328,7 +328,7 @@ static void testing_generic_array_input_conversion()
} }
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
{ {
const ArrayT<const char16_t, 4> var_zero_terminated_const_var_const_char = {{ u'1', u'0', u'0', u'\0'}}; const ArrayT<const char16_t, 4> var_zero_terminated_const_var_const_char = {{ u'1', u'0', u'0', u'\0'}};
BOOST_CHECK(lexical_cast<std::u16string>(var_zero_terminated_const_var_const_char) == u"100"); BOOST_CHECK(lexical_cast<std::u16string>(var_zero_terminated_const_var_const_char) == u"100");
@@ -339,7 +339,7 @@ static void testing_generic_array_input_conversion()
} }
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
{ {
const ArrayT<const char32_t, 4> var_zero_terminated_const_var_const_char = {{ U'1', U'0', U'0', U'\0'}}; const ArrayT<const char32_t, 4> var_zero_terminated_const_var_const_char = {{ U'1', U'0', U'0', U'\0'}};
BOOST_CHECK(lexical_cast<std::u32string>(var_zero_terminated_const_var_const_char) == U"100"); BOOST_CHECK(lexical_cast<std::u32string>(var_zero_terminated_const_var_const_char) == U"100");

4
test/lexical_cast_containers_test.cpp
View File

@@ -71,12 +71,12 @@ void testing_boost_containers_string_widening()
BOOST_CHECK(boost::lexical_cast<boost::container::wstring>(char_array) == wchar_array); BOOST_CHECK(boost::lexical_cast<boost::container::wstring>(char_array) == wchar_array);
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
const char16_t char16_array[] = u"Test string"; const char16_t char16_array[] = u"Test string";
BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char16_t> >(char_array) == char16_array); BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char16_t> >(char_array) == char16_array);
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
const char32_t char32_array[] = U"Test string"; const char32_t char32_array[] = U"Test string";
BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char32_t> >(char_array) == char32_array); BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char32_t> >(char_array) == char32_array);
#endif #endif

4
test/lexical_cast_empty_input_test.cpp
View File

@@ -84,12 +84,12 @@ void test_empty_string()
#endif #endif
// Currently, no compiler and STL library fully support char16_t and char32_t // Currently, no compiler and STL library fully support char16_t and char32_t
//#ifndef BOOST_NO_CHAR16_T //#ifndef BOOST_NO_CXX11_CHAR16_T
// std::basic_string<char16_t> v16w; // std::basic_string<char16_t> v16w;
// do_test_on_empty_input(v16w); // do_test_on_empty_input(v16w);
// BOOST_CHECK_THROW(lexical_cast<char16_t>(v16w), bad_lexical_cast); // BOOST_CHECK_THROW(lexical_cast<char16_t>(v16w), bad_lexical_cast);
//#endif //#endif
//#ifndef BOOST_NO_CHAR32_T //#ifndef BOOST_NO_CXX11_CHAR32_T
// std::basic_string<char32_t> v32w; // std::basic_string<char32_t> v32w;
// do_test_on_empty_input(v32w); // do_test_on_empty_input(v32w);
// BOOST_CHECK_THROW(lexical_cast<char32_t>(v32w), bad_lexical_cast); // BOOST_CHECK_THROW(lexical_cast<char32_t>(v32w), bad_lexical_cast);

4
test/lexical_cast_integral_types_test.cpp
View File

@@ -386,12 +386,12 @@ void test_conversion_from_to_integral()
test_conversion_from_integral_to_char<T>(wzero); test_conversion_from_integral_to_char<T>(wzero);
test_conversion_from_char_to_integral<T>(wzero); test_conversion_from_char_to_integral<T>(wzero);
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
char16_t const u16zero = u'0'; char16_t const u16zero = u'0';
test_conversion_from_integral_to_char<T>(u16zero); test_conversion_from_integral_to_char<T>(u16zero);
test_conversion_from_char_to_integral<T>(u16zero); test_conversion_from_char_to_integral<T>(u16zero);
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
char32_t const u32zero = u'0'; char32_t const u32zero = u'0';
test_conversion_from_integral_to_char<T>(u32zero); test_conversion_from_integral_to_char<T>(u32zero);
test_conversion_from_char_to_integral<T>(u32zero); test_conversion_from_char_to_integral<T>(u32zero);

8
test/lexical_cast_iterator_range_test.cpp
View File

@@ -134,7 +134,7 @@ void test_it_range_using_char(CharT* one, CharT* eleven)
BOOST_CHECK(lexical_cast<std::wstring>(crng2) == L"1"); BOOST_CHECK(lexical_cast<std::wstring>(crng2) == L"1");
#endif #endif
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
typedef std::basic_string<char16_t> my_char16_string; typedef std::basic_string<char16_t> my_char16_string;
BOOST_CHECK(lexical_cast<my_char16_string>(rng1) == u"1"); BOOST_CHECK(lexical_cast<my_char16_string>(rng1) == u"1");
BOOST_CHECK(lexical_cast<my_char16_string>(crng1) == u"1"); BOOST_CHECK(lexical_cast<my_char16_string>(crng1) == u"1");
@@ -142,7 +142,7 @@ void test_it_range_using_char(CharT* one, CharT* eleven)
BOOST_CHECK(lexical_cast<my_char16_string>(crng2) == u"1"); BOOST_CHECK(lexical_cast<my_char16_string>(crng2) == u"1");
#endif #endif
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
typedef std::basic_string<char32_t> my_char32_string; typedef std::basic_string<char32_t> my_char32_string;
BOOST_CHECK(lexical_cast<my_char32_string>(rng1) == U"1"); BOOST_CHECK(lexical_cast<my_char32_string>(rng1) == U"1");
BOOST_CHECK(lexical_cast<my_char32_string>(crng1) == U"1"); BOOST_CHECK(lexical_cast<my_char32_string>(crng1) == U"1");
@@ -194,7 +194,7 @@ void test_wchar_iterator_ranges()
void test_char16_iterator_ranges() void test_char16_iterator_ranges()
{ {
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef char16_t test_char_type; typedef char16_t test_char_type;
test_char_type data1[] = u"1"; test_char_type data1[] = u"1";
test_char_type data2[] = u"11"; test_char_type data2[] = u"11";
@@ -206,7 +206,7 @@ void test_char16_iterator_ranges()
void test_char32_iterator_ranges() void test_char32_iterator_ranges()
{ {
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
typedef char32_t test_char_type; typedef char32_t test_char_type;
test_char_type data1[] = U"1"; test_char_type data1[] = U"1";
test_char_type data2[] = U"11"; test_char_type data2[] = U"11";

4
test/lexical_cast_wchars_test.cpp
View File

@@ -58,7 +58,7 @@ void test_char_types_conversions_wchar_t()
void test_char_types_conversions_char16_t() void test_char_types_conversions_char16_t()
{ {
#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
test_impl(u"Test array of chars"); test_impl(u"Test array of chars");
#endif #endif
@@ -67,7 +67,7 @@ void test_char_types_conversions_char16_t()
void test_char_types_conversions_char32_t() void test_char_types_conversions_char32_t()
{ {
#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES) #if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
test_impl(U"Test array of chars"); test_impl(U"Test array of chars");
#endif #endif