diff --git a/test/msvc/common.props b/test/msvc/common.props index 6ac5ad6..0ad551c 100644 --- a/test/msvc/common.props +++ b/test/msvc/common.props @@ -6,7 +6,7 @@ ../../../../..;%(AdditionalIncludeDirectories) - BOOST_SYSTEM_NO_DEPRECATED;BOOST_ALL_NO_LIB;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) + BOOST_FILESYSTEM_VERSION=4;BOOST_SYSTEM_NO_DEPRECATED;BOOST_ALL_NO_LIB;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) Async false Level4 diff --git a/test/msvc/convenience_test/convenience_test.vcxproj b/test/msvc/convenience_test/convenience_test.vcxproj index c9ab76b..14dfa17 100644 --- a/test/msvc/convenience_test/convenience_test.vcxproj +++ b/test/msvc/convenience_test/convenience_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/deprecated_test/deprecated_test.vcxproj b/test/msvc/deprecated_test/deprecated_test.vcxproj index 943502c..1c5f1b3 100644 --- a/test/msvc/deprecated_test/deprecated_test.vcxproj +++ b/test/msvc/deprecated_test/deprecated_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/file_status/file_status.vcxproj b/test/msvc/file_status/file_status.vcxproj index 91721ba..1a746ce 100644 --- a/test/msvc/file_status/file_status.vcxproj +++ b/test/msvc/file_status/file_status.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/filesystem_dll/filesystem_dll.vcxproj b/test/msvc/filesystem_dll/filesystem_dll.vcxproj index 98ac781..ab79152 100644 --- a/test/msvc/filesystem_dll/filesystem_dll.vcxproj +++ b/test/msvc/filesystem_dll/filesystem_dll.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ DynamicLibrary Unicode true - v120 + v140 DynamicLibrary Unicode - v120 + v140 diff --git a/test/msvc/filesystem_lib/filesystem_lib.vcxproj b/test/msvc/filesystem_lib/filesystem_lib.vcxproj index 29eac94..3aecd33 100644 --- a/test/msvc/filesystem_lib/filesystem_lib.vcxproj +++ b/test/msvc/filesystem_lib/filesystem_lib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -35,14 +35,14 @@ StaticLibrary true Unicode - v120 + v140 StaticLibrary false true Unicode - v120 + v140 diff --git a/test/msvc/fstream_test/fstream_test.vcxproj b/test/msvc/fstream_test/fstream_test.vcxproj index fbd26f2..dba20e5 100644 --- a/test/msvc/fstream_test/fstream_test.vcxproj +++ b/test/msvc/fstream_test/fstream_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/header_inclusion/header_inclusion.vcxproj b/test/msvc/header_inclusion/header_inclusion.vcxproj index 9a87664..e963f4d 100644 --- a/test/msvc/header_inclusion/header_inclusion.vcxproj +++ b/test/msvc/header_inclusion/header_inclusion.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,13 +18,13 @@ Application true - v120 + v140 MultiByte Application false - v120 + v140 true MultiByte diff --git a/test/msvc/hello_filesystem/hello_filesystem.vcxproj b/test/msvc/hello_filesystem/hello_filesystem.vcxproj index 5a9cc95..7c42df8 100644 --- a/test/msvc/hello_filesystem/hello_filesystem.vcxproj +++ b/test/msvc/hello_filesystem/hello_filesystem.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/hello_filesystem_static/hello_filesystem_static.vcxproj b/test/msvc/hello_filesystem_static/hello_filesystem_static.vcxproj index 0b8ae73..264b43c 100644 --- a/test/msvc/hello_filesystem_static/hello_filesystem_static.vcxproj +++ b/test/msvc/hello_filesystem_static/hello_filesystem_static.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/locale_info/locale_info.vcxproj b/test/msvc/locale_info/locale_info.vcxproj index 4b9f69e..66629ab 100644 --- a/test/msvc/locale_info/locale_info.vcxproj +++ b/test/msvc/locale_info/locale_info.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/long_path_test/long_path_test.vcxproj b/test/msvc/long_path_test/long_path_test.vcxproj index 2cd3b3e..c8e86dd 100644 --- a/test/msvc/long_path_test/long_path_test.vcxproj +++ b/test/msvc/long_path_test/long_path_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/macro_default_test/macro_default_test.vcxproj b/test/msvc/macro_default_test/macro_default_test.vcxproj index 1788469..4a24893 100644 --- a/test/msvc/macro_default_test/macro_default_test.vcxproj +++ b/test/msvc/macro_default_test/macro_default_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/odr_test/odr_test.vcxproj b/test/msvc/odr_test/odr_test.vcxproj index c3eb0ff..a6ea253 100644 --- a/test/msvc/odr_test/odr_test.vcxproj +++ b/test/msvc/odr_test/odr_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/operations_test/operations_test.vcxproj b/test/msvc/operations_test/operations_test.vcxproj index a5addf0..67f9618 100644 --- a/test/msvc/operations_test/operations_test.vcxproj +++ b/test/msvc/operations_test/operations_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/operations_unit_test/operations_unit_test.vcxproj b/test/msvc/operations_unit_test/operations_unit_test.vcxproj index f0f46a5..67fd0ab 100644 --- a/test/msvc/operations_unit_test/operations_unit_test.vcxproj +++ b/test/msvc/operations_unit_test/operations_unit_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/path_test/path_test.vcxproj b/test/msvc/path_test/path_test.vcxproj index 5d73634..354d35c 100644 --- a/test/msvc/path_test/path_test.vcxproj +++ b/test/msvc/path_test/path_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/path_test_static/path_test_static.vcxproj b/test/msvc/path_test_static/path_test_static.vcxproj index 3380d95..133661b 100644 --- a/test/msvc/path_test_static/path_test_static.vcxproj +++ b/test/msvc/path_test_static/path_test_static.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/path_timings/path_timings.vcxproj b/test/msvc/path_timings/path_timings.vcxproj index 5b03c7c..8721fb4 100644 --- a/test/msvc/path_timings/path_timings.vcxproj +++ b/test/msvc/path_timings/path_timings.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/path_unit_test/path_unit_test.vcxproj b/test/msvc/path_unit_test/path_unit_test.vcxproj index c60500e..ba86e47 100644 --- a/test/msvc/path_unit_test/path_unit_test.vcxproj +++ b/test/msvc/path_unit_test/path_unit_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj b/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj index 6fc7794..f1e7ca9 100644 --- a/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj +++ b/test/msvc/recurse_dir_iter_test/recurse_dir_iter_test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v120 + v140 Unicode Application false - v120 + v140 true Unicode diff --git a/test/msvc/stems/stems.vcxproj b/test/msvc/stems/stems.vcxproj index 1e58b0b..4687d3b 100644 --- a/test/msvc/stems/stems.vcxproj +++ b/test/msvc/stems/stems.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/system_dll/system_dll.vcxproj b/test/msvc/system_dll/system_dll.vcxproj index 6415ccf..2a5d855 100644 --- a/test/msvc/system_dll/system_dll.vcxproj +++ b/test/msvc/system_dll/system_dll.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,12 +23,12 @@ DynamicLibrary Unicode true - v120 + v140 DynamicLibrary Unicode - v120 + v140 diff --git a/test/msvc/system_lib/system_lib.vcxproj b/test/msvc/system_lib/system_lib.vcxproj index bf08571..0603340 100644 --- a/test/msvc/system_lib/system_lib.vcxproj +++ b/test/msvc/system_lib/system_lib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ StaticLibrary true Unicode - v120 + v140 StaticLibrary false true Unicode - v120 + v140 diff --git a/test/msvc/tut1/tut1.vcxproj b/test/msvc/tut1/tut1.vcxproj index 49a6289..95403ce 100644 --- a/test/msvc/tut1/tut1.vcxproj +++ b/test/msvc/tut1/tut1.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/tut2/tut2.vcxproj b/test/msvc/tut2/tut2.vcxproj index 7a1e355..590dc78 100644 --- a/test/msvc/tut2/tut2.vcxproj +++ b/test/msvc/tut2/tut2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/tut3/tut3.vcxproj b/test/msvc/tut3/tut3.vcxproj index eb7ed2d..c53d0ea 100644 --- a/test/msvc/tut3/tut3.vcxproj +++ b/test/msvc/tut3/tut3.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/tut4/tut4.vcxproj b/test/msvc/tut4/tut4.vcxproj index 472c23d..ea22114 100644 --- a/test/msvc/tut4/tut4.vcxproj +++ b/test/msvc/tut4/tut4.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,12 +20,12 @@ Application Unicode true - v120 + v140 Application Unicode - v120 + v140 diff --git a/test/msvc/tut5/tut5.vcxproj b/test/msvc/tut5/tut5.vcxproj index 0d68487..4348f29 100644 --- a/test/msvc/tut5/tut5.vcxproj +++ b/test/msvc/tut5/tut5.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/tut6a/tut6a.vcxproj b/test/msvc/tut6a/tut6a.vcxproj index cbd371e..17e1498 100644 --- a/test/msvc/tut6a/tut6a.vcxproj +++ b/test/msvc/tut6a/tut6a.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/tut6b/tut6b.vcxproj b/test/msvc/tut6b/tut6b.vcxproj index 3f43c40..34efae5 100644 --- a/test/msvc/tut6b/tut6b.vcxproj +++ b/test/msvc/tut6b/tut6b.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/tut6c/tut6c.vcxproj b/test/msvc/tut6c/tut6c.vcxproj index c34c300..84a1290 100644 --- a/test/msvc/tut6c/tut6c.vcxproj +++ b/test/msvc/tut6c/tut6c.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/msvc/windows_attributes/windows_attributes.vcxproj b/test/msvc/windows_attributes/windows_attributes.vcxproj index 0cf6c6c..a2a6829 100644 --- a/test/msvc/windows_attributes/windows_attributes.vcxproj +++ b/test/msvc/windows_attributes/windows_attributes.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,14 +20,14 @@ Application true Unicode - v120 + v140 Application false true Unicode - v120 + v140 diff --git a/test/path_unit_test.cpp b/test/path_unit_test.cpp index 1229738..494d1fb 100644 --- a/test/path_unit_test.cpp +++ b/test/path_unit_test.cpp @@ -140,9 +140,9 @@ namespace << L"\"\n" ; } - void check(bool ok, const char* file, int line) + void check(bool ok_, const char* file, int line) { - if (ok) return; + if (ok_) return; ++::boost::detail::test_errors(); @@ -318,17 +318,17 @@ namespace #ifdef BOOST_FILESYSTEM_CHAR16_CHAR32 { - path x1(u32a); - PATH_IS(x1, L"u32string"); - BOOST_TEST_EQ(x1.native().size(), 9U); + path x1_32(u32a); + PATH_IS(x1_32, L"u32string"); + BOOST_TEST_EQ(x1_32.native().size(), 9U); - path x2(u32s); - PATH_IS(x2, L"u32string"); - BOOST_TEST_EQ(x2.native().size(), 9U); + path x2_32(u32s); + PATH_IS(x2_32, L"u32string"); + BOOST_TEST_EQ(x2_32.native().size(), 9U); - path x3(&u32a[0], &u32a[8]); - PATH_IS(x3, L"u32string"); - BOOST_TEST_EQ(x3.native().size(), 9U); + path x3_32(&u32a[0], &u32a[8]); + PATH_IS(x3_32, L"u32string"); + BOOST_TEST_EQ(x3_32.native().size(), 9U); } #endif @@ -948,17 +948,17 @@ namespace void test_overloads() { std::cout << "testing overloads..." << std::endl; - std::string s("hello"); + std::string shello("hello"); const char a[] = "goodbye"; - path p1(s); - path p2(s.c_str()); + path p1(shello); + path p2(shello.c_str()); path p3(a); path p4("foo"); - std::wstring ws(L"hello"); + std::wstring wshello(L"hello"); const wchar_t wa[] = L"goodbye"; - path wp1(ws); - path wp2(ws.c_str()); + path wp1(wshello); + path wp2(wshello.c_str()); path wp3(wa); path wp4(L"foo"); }