From d4365dc83be7cf20fbaeabf9878ff03ef02a0a01 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Wed, 24 Jul 2002 19:39:46 +0000 Subject: [PATCH] Move "system_spacific" out of path [SVN r309] --- src/path_posix_windows.cpp | 4 +-- test/operations_test.cpp | 2 +- test/path_test.cpp | 66 +++++++++++++++++++------------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/path_posix_windows.cpp b/src/path_posix_windows.cpp index 47a7806..304736a 100644 --- a/src/path_posix_windows.cpp +++ b/src/path_posix_windows.cpp @@ -148,12 +148,12 @@ namespace boost m_path_append( src ); } - path::path( const std::string & src, format ) + path::path( const std::string & src, path_format ) { m_path_append( src, platform ); } - path::path( const char * src, format ) + path::path( const char * src, path_format ) { m_path_append( src, platform ); } diff --git a/test/operations_test.cpp b/test/operations_test.cpp index 20ac838..904868f 100644 --- a/test/operations_test.cpp +++ b/test/operations_test.cpp @@ -77,7 +77,7 @@ int test_main( int, char * [] ) && dir.generic_path()[1] == ':' ); // verify path includes drive #endif - fs::path ng( " no-way, Jose ", fs::path::system_specific ); + fs::path ng( " no-way, Jose ", fs::system_specific ); fs::remove_all( dir ); // in case residue from prior failed tests BOOST_TEST( !fs::exists( dir ) ); diff --git a/test/path_test.cpp b/test/path_test.cpp index a593441..214f251 100644 --- a/test/path_test.cpp +++ b/test/path_test.cpp @@ -180,44 +180,44 @@ int test_main( int, char*[] ) # ifdef BOOST_WINDOWS - check( path( "/", path::system_specific ), "/" ); - check( path( "/f", path::system_specific ), "/f" ); - check( path( "/foo", path::system_specific ), "/foo" ); - check( path( "\\", path::system_specific ), "/" ); - check( path( "\\f", path::system_specific ), "/f" ); - check( path( "\\foo", path::system_specific ), "/foo" ); - check( path( "foo\\bar", path::system_specific ), "foo/bar" ); - check( path( "foo bar", path::system_specific ), "foo bar" ); - check( path( "c:", path::system_specific ), "c:" ); - check( path( "c:/", path::system_specific ), "c:/" ); - check( path( "c:foo", path::system_specific ), "c:foo" ); - check( path( "c:/foo", path::system_specific ), "c:/foo" ); - check( path( "//share", path::system_specific ), "//share" ); - check( path( "//share/foo", path::system_specific ), "//share/foo" ); - check( path( "\\\\share", path::system_specific ), "//share" ); - check( path( "\\\\share\\foo", path::system_specific ), "//share/foo" ); - check( path( "c:/foo", path::system_specific ), "c:/foo" ); - check( path( "prn:", path::system_specific ), "prn:" ); + check( path( "/", fs::system_specific ), "/" ); + check( path( "/f", fs::system_specific ), "/f" ); + check( path( "/foo", fs::system_specific ), "/foo" ); + check( path( "\\", fs::system_specific ), "/" ); + check( path( "\\f", fs::system_specific ), "/f" ); + check( path( "\\foo", fs::system_specific ), "/foo" ); + check( path( "foo\\bar", fs::system_specific ), "foo/bar" ); + check( path( "foo bar", fs::system_specific ), "foo bar" ); + check( path( "c:", fs::system_specific ), "c:" ); + check( path( "c:/", fs::system_specific ), "c:/" ); + check( path( "c:foo", fs::system_specific ), "c:foo" ); + check( path( "c:/foo", fs::system_specific ), "c:/foo" ); + check( path( "//share", fs::system_specific ), "//share" ); + check( path( "//share/foo", fs::system_specific ), "//share/foo" ); + check( path( "\\\\share", fs::system_specific ), "//share" ); + check( path( "\\\\share\\foo", fs::system_specific ), "//share/foo" ); + check( path( "c:/foo", fs::system_specific ), "c:/foo" ); + check( path( "prn:", fs::system_specific ), "prn:" ); - BOOST_TEST( path( "/", path::system_specific ).leaf() == "/" ); - BOOST_TEST( path( "c:", path::system_specific ).leaf() == "c:" ); - BOOST_TEST( path( "c:/", path::system_specific ).leaf() == "c:/" ); - BOOST_TEST( path( "c:foo", path::system_specific ).leaf() == "foo" ); - BOOST_TEST( path( "c:/foo", path::system_specific ).leaf() == "foo" ); - BOOST_TEST( path( "//share", path::system_specific ).leaf() == "//share" ); - BOOST_TEST( path( "//share/foo", path::system_specific ).leaf() == "foo" ); + BOOST_TEST( path( "/", fs::system_specific ).leaf() == "/" ); + BOOST_TEST( path( "c:", fs::system_specific ).leaf() == "c:" ); + BOOST_TEST( path( "c:/", fs::system_specific ).leaf() == "c:/" ); + BOOST_TEST( path( "c:foo", fs::system_specific ).leaf() == "foo" ); + BOOST_TEST( path( "c:/foo", fs::system_specific ).leaf() == "foo" ); + BOOST_TEST( path( "//share", fs::system_specific ).leaf() == "//share" ); + BOOST_TEST( path( "//share/foo", fs::system_specific ).leaf() == "foo" ); - BOOST_TEST( path( "/", path::system_specific ).branch().generic_path() == "" ); - BOOST_TEST( path( "c:", path::system_specific ).branch().generic_path() == "" ); - BOOST_TEST( path( "c:/", path::system_specific ).branch().generic_path() == "" ); - BOOST_TEST( path( "c:foo", path::system_specific ).branch().generic_path() == "c:" ); - BOOST_TEST( path( "c:/foo", path::system_specific ).branch().generic_path() == "c:/" ); - BOOST_TEST( path( "//share", path::system_specific ).branch().generic_path() == "" ); - BOOST_TEST( path( "//share/foo", path::system_specific ).branch().generic_path() == "//share" ); + BOOST_TEST( path( "/", fs::system_specific ).branch().generic_path() == "" ); + BOOST_TEST( path( "c:", fs::system_specific ).branch().generic_path() == "" ); + BOOST_TEST( path( "c:/", fs::system_specific ).branch().generic_path() == "" ); + BOOST_TEST( path( "c:foo", fs::system_specific ).branch().generic_path() == "c:" ); + BOOST_TEST( path( "c:/foo", fs::system_specific ).branch().generic_path() == "c:/" ); + BOOST_TEST( path( "//share", fs::system_specific ).branch().generic_path() == "" ); + BOOST_TEST( path( "//share/foo", fs::system_specific ).branch().generic_path() == "//share" ); # endif // BOOST_WINDOWS // std::cout << errors << " errors detected\n"; return errors; -} \ No newline at end of file +}