From 2e04f05eda3e59a4fb35423bf3ccdba047f19488 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 1 May 2024 01:03:06 +0300 Subject: [PATCH] Remove uses of BOOST_NO_STD_WSTRING --- include/boost/uuid/uuid_io.hpp | 4 ---- test/test_generators.cpp | 2 -- test/test_io.cpp | 15 +-------------- test/test_name_generator.cpp | 2 -- test/test_string_generator.cpp | 5 +---- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/include/boost/uuid/uuid_io.hpp b/include/boost/uuid/uuid_io.hpp index 2323cdc..6baaa05 100644 --- a/include/boost/uuid/uuid_io.hpp +++ b/include/boost/uuid/uuid_io.hpp @@ -220,8 +220,6 @@ inline std::string to_string( uuid const& u ) return result; } -#ifndef BOOST_NO_STD_WSTRING - inline std::wstring to_wstring( uuid const& u ) { std::wstring result( 36, wchar_t() ); @@ -230,8 +228,6 @@ inline std::wstring to_wstring( uuid const& u ) return result; } -#endif - }} //namespace boost::uuids #if defined(_MSC_VER) diff --git a/test/test_generators.cpp b/test/test_generators.cpp index db6cf61..30cc2e2 100644 --- a/test/test_generators.cpp +++ b/test/test_generators.cpp @@ -71,13 +71,11 @@ int test_main(int, char*[]) u = gen(std::string("fedcba98-7654-3210-fedc-ba9876543210")); BOOST_CHECK_EQUAL(u, u_decreasing); -#ifndef BOOST_NO_STD_WSTRING u = gen(L"fedcba98-7654-3210-fedc-ba9876543210"); BOOST_CHECK_EQUAL(u, u_decreasing); u = gen(std::wstring(L"01234567-89ab-cdef-0123-456789abcdef")); BOOST_CHECK_EQUAL(u, u_increasing); -#endif //BOOST_NO_STD_WSTRING } { // test name_generator diff --git a/test/test_io.cpp b/test/test_io.cpp index 89b7d6e..33e0152 100644 --- a/test/test_io.cpp +++ b/test/test_io.cpp @@ -38,7 +38,6 @@ void uufail(const std::string& in) BOOST_TEST_EQ(true, ss.fail()); } -#ifndef BOOST_NO_STD_WSTRING void uufail(const std::wstring& in) { uuid out; @@ -47,7 +46,6 @@ void uufail(const std::wstring& in) ss >> out; BOOST_TEST_EQ(true, ss.fail()); } -#endif void uuroundtrip(const uuid& in, const std::string& expect) { @@ -64,7 +62,6 @@ void uuroundtrip(const uuid& in, const std::string& expect) BOOST_TEST_EQ(in, out); } -#ifndef BOOST_NO_STD_WSTRING void uuroundtrip(const uuid& in, const std::wstring& expect) { std::wstringstream ss; @@ -79,9 +76,8 @@ void uuroundtrip(const uuid& in, const std::wstring& expect) BOOST_TEST_EQ(false, ss2.fail()); BOOST_TEST (in == out); } -#endif -int main(int, char*[]) +int main() { const uuid u1 = {{0}}; const uuid u2 = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}}; @@ -103,11 +99,9 @@ int main(int, char*[]) ss7 << std::left << std::setfill('*') << std::setw(45) << u2; BOOST_TEST_EQ(ss7.str(), "00010203-0405-0607-0809-0a0b0c0d0e0f*********"); -#ifndef BOOST_NO_STD_WSTRING uuroundtrip(u1, L"00000000-0000-0000-0000-000000000000"); uuroundtrip(u2, L"00010203-0405-0607-0809-0a0b0c0d0e0f"); uuroundtrip(u3, L"12345678-90ab-cdef-1234-567890abcdef"); -#endif const char raw[36] = { '0', '1', '2', '3', '4', '5', '6', '7', '-', '8', '9', 'a', 'b', '-', @@ -124,7 +118,6 @@ int main(int, char*[]) uufail("G1234567-89AB-CDEF-0123-456789abcdef"); uufail("01234567-89AB-CDEF-0123-456789abcdeg"); -#ifndef BOOST_NO_STD_WSTRING uufail(L"01234567-89ab-cdef-"); uufail(L"01234567-89ab-cdef-0123456789abcdef"); uufail(L"01234567-89ab-cdef0123-456789abcdef"); @@ -133,7 +126,6 @@ int main(int, char*[]) uufail(L"{12345678-90ab-cdef-1234-567890abcdef}"); // stream is not as flexible as string uufail(L"G1234567-89AB-CDEF-0123-456789abcdef"); uufail(L"01234567-89AB-CDEF-0123-456789abcdeg"); -#endif #if defined(HAVE_LEXICAL_CAST) // lexical_cast depends on sprintf which is not available in cloudlibc @@ -143,13 +135,11 @@ int main(int, char*[]) BOOST_TEST(boost::lexical_cast(u3) == std::string("12345678-90ab-cdef-1234-567890abcdef")); BOOST_TEST(boost::lexical_cast("12345678-90ab-cdef-1234-567890abcdef") == u3); -#ifndef BOOST_NO_STD_WSTRING BOOST_TEST(boost::lexical_cast(u1) == std::wstring(L"00000000-0000-0000-0000-000000000000")); BOOST_TEST(boost::lexical_cast(L"00000000-0000-0000-0000-000000000000") == u1); BOOST_TEST(boost::lexical_cast(u3) == std::wstring(L"12345678-90ab-cdef-1234-567890abcdef")); BOOST_TEST(boost::lexical_cast(L"12345678-90ab-cdef-1234-567890abcdef") == u3); -#endif #endif @@ -189,11 +179,8 @@ int main(int, char*[]) BOOST_TEST(to_string(u1) == std::string("00000000-0000-0000-0000-000000000000")); BOOST_TEST(to_string(u3) == std::string("12345678-90ab-cdef-1234-567890abcdef")); -#ifndef BOOST_NO_STD_WSTRING BOOST_TEST(to_wstring(u1) == std::wstring(L"00000000-0000-0000-0000-000000000000")); BOOST_TEST(to_wstring(u3) == std::wstring(L"12345678-90ab-cdef-1234-567890abcdef")); -#endif return boost::report_errors(); } - diff --git a/test/test_name_generator.cpp b/test/test_name_generator.cpp index 2990297..21aee3d 100644 --- a/test/test_name_generator.cpp +++ b/test/test_name_generator.cpp @@ -58,11 +58,9 @@ int main() BOOST_TEST_EQ(u, wcorrect_sha1); BOOST_TEST_EQ(u.variant(), boost::uuids::uuid::variant_rfc_4122); -#ifndef BOOST_NO_STD_WSTRING u = gen(std::wstring(L"www.widgets.com")); BOOST_TEST_EQ(u, wcorrect_sha1); BOOST_TEST_EQ(u.variant(), boost::uuids::uuid::variant_rfc_4122); -#endif char name[] = "www.widgets.com"; u = gen(name, 15); diff --git a/test/test_string_generator.cpp b/test/test_string_generator.cpp index f210f36..9afe18b 100644 --- a/test/test_string_generator.cpp +++ b/test/test_string_generator.cpp @@ -47,7 +47,6 @@ int main(int, char*[]) u = gen(std::string("fedcba98-7654-3210-fedc-ba9876543210")); BOOST_TEST_EQ(u, u_decreasing); -#ifndef BOOST_NO_STD_WSTRING u = gen(L"fedcba98-7654-3210-fedc-ba9876543210"); BOOST_TEST_EQ(u, u_decreasing); @@ -56,7 +55,6 @@ int main(int, char*[]) u = gen(std::wstring(L"{01234567-89ab-cdef-0123-456789abcdef}")); BOOST_TEST_EQ(u, u_increasing); -#endif //BOOST_NO_STD_WSTRING const char raw[36] = { '0', '1', '2', '3', '4', '5', '6', '7', '-', '8', '9', 'a', 'b', '-', @@ -73,12 +71,11 @@ int main(int, char*[]) BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef)"), std::runtime_error); BOOST_TEST_THROWS(gen("{01234567-89AB-CDEF-0123-456789abcdef"), std::runtime_error); BOOST_TEST_THROWS(gen("01234567-89AB-CDEF-0123-456789abcdef}"), std::runtime_error); -#ifndef BOOST_NO_STD_WSTRING + BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef)")), std::runtime_error); BOOST_TEST_THROWS(gen(std::wstring(L"{01234567-89AB-CDEF-0123-456789abcdef")), std::runtime_error); BOOST_TEST_THROWS(gen(std::wstring(L"01234567-89AB-CDEF-0123-456789abcdef}")), std::runtime_error); BOOST_TEST_THROWS(gen(std::wstring(L"G1234567-89AB-CDEF-0123-456789abcdef}")), std::runtime_error); -#endif //BOOST_NO_STD_WSTRING BOOST_TEST_THROWS(gen("G1234567-89AB-CDEF-0123-456789abcdef"), std::runtime_error); BOOST_TEST_THROWS(gen("Have a great big roast-beef sandwich!"), std::runtime_error);