Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r77390 - in branches/filesystem-v3: boost/filesystem libs/filesystem/build libs/filesystem/example libs/filesystem/src libs/filesystem/test libs/filesystem/test/msvc libs/filesystem/test/msvc10 libs/filesystem/test/msvc10/system_dll
From: bdawes_at_[hidden]
Date: 2012-03-18 18:03:44

Author: bemandawes
Date: 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
New Revision: 77390
URL: http://svn.boost.org/trac/boost/changeset/77390

Log:
VC++ 10 passing all tests after correcting .../v3/... in various paths
Added:
   branches/filesystem-v3/libs/filesystem/example/tut6a.cpp (contents, props changed)
   branches/filesystem-v3/libs/filesystem/example/tut6b.cpp (contents, props changed)
   branches/filesystem-v3/libs/filesystem/example/tut6c.cpp (contents, props changed)
Removed:
   branches/filesystem-v3/libs/filesystem/test/msvc/
Text files modified:
   branches/filesystem-v3/boost/filesystem/convenience.hpp | 2 +-
   branches/filesystem-v3/boost/filesystem/fstream.hpp | 2 +-
   branches/filesystem-v3/boost/filesystem/operations.hpp | 4 ++--
   branches/filesystem-v3/boost/filesystem/path.hpp | 4 ++--
   branches/filesystem-v3/boost/filesystem/path_traits.hpp | 2 +-
   branches/filesystem-v3/libs/filesystem/build/Jamfile.v2 | 15 +++++++++++----
   branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp | 4 ++--
   branches/filesystem-v3/libs/filesystem/src/operations.cpp | 2 +-
   branches/filesystem-v3/libs/filesystem/src/path.cpp | 4 ++--
   branches/filesystem-v3/libs/filesystem/src/path_traits.cpp | 4 ++--
   branches/filesystem-v3/libs/filesystem/src/portability.cpp | 4 ++--
   branches/filesystem-v3/libs/filesystem/src/unique_path.cpp | 2 +-
   branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.cpp | 2 +-
   branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.hpp | 2 +-
   branches/filesystem-v3/libs/filesystem/test/msvc10/common.props | 4 ++--
   branches/filesystem-v3/libs/filesystem/test/msvc10/system_dll/system_dll.vcxproj | 2 +-
   branches/filesystem-v3/libs/filesystem/test/test_codecvt.hpp | 2 +-
   17 files changed, 34 insertions(+), 27 deletions(-)

Modified: branches/filesystem-v3/boost/filesystem/convenience.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/convenience.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/convenience.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -19,7 +19,7 @@
 # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 
-#include <boost/filesystem/v3/operations.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <boost/config/abi_prefix.hpp> // must be the last #include

Modified: branches/filesystem-v3/boost/filesystem/fstream.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/fstream.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/fstream.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -18,7 +18,7 @@
 # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 
-#include <boost/filesystem/v3/path.hpp>
+#include <boost/filesystem/path.hpp>
 #include <iosfwd>
 #include <fstream>
 

Modified: branches/filesystem-v3/boost/filesystem/operations.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/operations.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/operations.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -21,8 +21,8 @@
 # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path.hpp>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path.hpp>
 
 #include <boost/detail/scoped_enum_emulation.hpp>
 #include <boost/detail/bitmask.hpp>

Modified: branches/filesystem-v3/boost/filesystem/path.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/path.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/path.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -21,8 +21,8 @@
 # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path_traits.hpp> // includes <cwchar>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path_traits.hpp> // includes <cwchar>
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/iterator/iterator_facade.hpp>

Modified: branches/filesystem-v3/boost/filesystem/path_traits.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/path_traits.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/path_traits.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -16,7 +16,7 @@
 # error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
 # endif
 
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_array.hpp>
 #include <boost/type_traits/decay.hpp>

Modified: branches/filesystem-v3/libs/filesystem/build/Jamfile.v2
==============================================================================
--- branches/filesystem-v3/libs/filesystem/build/Jamfile.v2 (original)
+++ branches/filesystem-v3/libs/filesystem/build/Jamfile.v2 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -2,8 +2,7 @@
 
 # (C) Copyright Beman Dawes 2002-2006
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
-
+# See www.boost.org/LICENSE_1_0.txt
 
 # See library home page at http://www.boost.org/libs/filesystem
 
@@ -14,7 +13,15 @@
     ;
 
 SOURCES =
- operations path path_traits portability unique_path utf8_codecvt_facet windows_file_codecvt codecvt_error_category ;
+ codecvt_error_category
+ operations
+ path
+ path_traits
+ portability
+ unique_path
+ utf8_codecvt_facet
+ windows_file_codecvt
+ ;
 
 lib boost_filesystem
     : $(SOURCES).cpp ../../system/build//boost_system
@@ -29,4 +36,4 @@
       <link>shared:<library>../../system/build//boost_system
     ;
 
-boost-install boost_filesystem ;
\ No newline at end of file
+boost-install boost_filesystem ;

Added: branches/filesystem-v3/libs/filesystem/example/tut6a.cpp
==============================================================================
--- (empty file)
+++ branches/filesystem-v3/libs/filesystem/example/tut6a.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -0,0 +1,48 @@
+// filesystem tut6a.cpp --------------------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+#include <iostream>
+#include <exception>
+#include <boost/filesystem.hpp>
+using namespace boost::filesystem;
+
+int main(int argc, char* argv[])
+{
+ if (argc < 2)
+ {
+ std::cout << "Usage: tut6a path\n";
+ return 1;
+ }
+
+ try
+ {
+ for (recursive_directory_iterator it (argv[1]);
+ it != recursive_directory_iterator();
+ ++it)
+ {
+ if (it.level() > 1)
+ it.pop();
+ else
+ {
+ for (int i = 0; i <= it.level(); ++i)
+ std::cout << " ";
+
+ std::cout << it->path() << '\n';
+ }
+ }
+ }
+
+ catch (const std::exception& ex)
+ {
+ std::cout << "************* exception *****************\n";
+ std::cout << ex.what() << '\n';
+ }
+
+ return 0;
+}

Added: branches/filesystem-v3/libs/filesystem/example/tut6b.cpp
==============================================================================
--- (empty file)
+++ branches/filesystem-v3/libs/filesystem/example/tut6b.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -0,0 +1,50 @@
+// filesystem tut6b.cpp --------------------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+#include <iostream>
+#include <exception>
+#include <boost/filesystem.hpp>
+using namespace boost::filesystem;
+
+int main(int argc, char* argv[])
+{
+ if (argc < 2)
+ {
+ std::cout << "Usage: tut6b path\n";
+ return 1;
+ }
+
+ try
+ {
+ for (recursive_directory_iterator it (argv[1]);
+ it != recursive_directory_iterator();
+ )
+ {
+ for (int i = 0; i <= it.level(); ++i)
+ std::cout << " ";
+
+ std::cout << it->path() << '\n';
+
+ try { ++it; }
+ catch (const filesystem_error& ex)
+ {
+ std::cout << "************* filesystem_error *****************\n";
+ std::cout << ex.what() << '\n';
+ }
+ }
+ }
+
+ catch (const std::exception& ex)
+ {
+ std::cout << "************* exception *****************\n";
+ std::cout << ex.what() << '\n';
+ }
+
+ return 0;
+}

Added: branches/filesystem-v3/libs/filesystem/example/tut6c.cpp
==============================================================================
--- (empty file)
+++ branches/filesystem-v3/libs/filesystem/example/tut6c.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -0,0 +1,40 @@
+// filesystem tut6c.cpp --------------------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+#include <iostream>
+#include <exception>
+#include <boost/filesystem.hpp>
+#include <boost/system/error_code.hpp>
+
+using namespace boost::filesystem;
+using namespace boost::system;
+
+int main(int argc, char* argv[])
+{
+ if (argc < 2)
+ {
+ std::cout << "Usage: tut6c path\n";
+ return 1;
+ }
+
+ error_code ec;
+ for (recursive_directory_iterator it (argv[1], ec);
+ it != recursive_directory_iterator();
+ )
+ {
+ for (int i = 0; i <= it.level(); ++i)
+ std::cout << " ";
+
+ std::cout << it->path() << '\n';
+
+ it.increment(ec);
+ }
+
+ return 0;
+}

Modified: branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -26,8 +26,8 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path_traits.hpp>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path_traits.hpp>
 #include <boost/system/error_code.hpp>
 #include <locale>
 #include <vector>

Modified: branches/filesystem-v3/libs/filesystem/src/operations.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/operations.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/operations.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -49,7 +49,7 @@
 # define _POSIX_PTHREAD_SEMANTICS // Sun readdir_r()needs this
 #endif
 
-#include <boost/filesystem/v3/operations.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/detail/workaround.hpp>
 #include <vector>

Modified: branches/filesystem-v3/libs/filesystem/src/path.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/path.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/path.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -22,8 +22,8 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path.hpp>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/assert.hpp>

Modified: branches/filesystem-v3/libs/filesystem/src/path_traits.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/path_traits.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/path_traits.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -24,8 +24,8 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path_traits.hpp>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path_traits.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/scoped_array.hpp>
 #include <locale> // for codecvt_base::result

Modified: branches/filesystem-v3/libs/filesystem/src/portability.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/portability.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/portability.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -24,8 +24,8 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/config.hpp>
-#include <boost/filesystem/v3/path.hpp>
+#include <boost/filesystem/config.hpp>
+#include <boost/filesystem/path.hpp>
 
 namespace fs = boost::filesystem3;
 

Modified: branches/filesystem-v3/libs/filesystem/src/unique_path.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/unique_path.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/unique_path.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -24,7 +24,7 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/operations.hpp>
+#include <boost/filesystem/operations.hpp>
 
 # ifdef BOOST_POSIX_API
 # include <fcntl.h>

Modified: branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.cpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -24,7 +24,7 @@
 # define BOOST_SYSTEM_NO_DEPRECATED
 #endif
 
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
 #include <cwchar> // for mbstate_t
 
 #ifdef BOOST_WINDOWS_API

Modified: branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.hpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.hpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/windows_file_codecvt.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -10,7 +10,7 @@
 #ifndef BOOST_FILESYSTEM3_WIN_FILE_CODECVT_HPP
 #define BOOST_FILESYSTEM3_WIN_FILE_CODECVT_HPP
 
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
 #include <locale>
 
   //------------------------------------------------------------------------------------//

Modified: branches/filesystem-v3/libs/filesystem/test/msvc10/common.props
==============================================================================
--- branches/filesystem-v3/libs/filesystem/test/msvc10/common.props (original)
+++ branches/filesystem-v3/libs/filesystem/test/msvc10/common.props 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
- <AdditionalIncludeDirectories>../../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;BOOST_SYSTEM_NO_DEPRECATED;BOOST_ALL_NO_LIB;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>BOOST_SYSTEM_NO_DEPRECATED;BOOST_ALL_NO_LIB;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <WarningLevel>Level4</WarningLevel>

Modified: branches/filesystem-v3/libs/filesystem/test/msvc10/system_dll/system_dll.vcxproj
==============================================================================
--- branches/filesystem-v3/libs/filesystem/test/msvc10/system_dll/system_dll.vcxproj (original)
+++ branches/filesystem-v3/libs/filesystem/test/msvc10/system_dll/system_dll.vcxproj 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -89,7 +89,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
- <ClCompile Include="..\..\..\..\..\system\src\error_code.cpp" />
+ <ClCompile Include="..\..\..\..\system\src\error_code.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/filesystem-v3/libs/filesystem/test/test_codecvt.hpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/test/test_codecvt.hpp (original)
+++ branches/filesystem-v3/libs/filesystem/test/test_codecvt.hpp 2012-03-18 18:03:42 EDT (Sun, 18 Mar 2012)
@@ -10,7 +10,7 @@
 #ifndef BOOST_FILESYSTEM3_TEST_CODECVT_HPP
 #define BOOST_FILESYSTEM3_TEST_CODECVT_HPP
 
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
 #include <locale>
 #include <cwchar> // for mbstate_t
 

Date view Thread view Subject view Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk