Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r77555 - in trunk: boost/filesystem boost/filesystem/v3 libs/filesystem libs/filesystem/build libs/filesystem/doc libs/filesystem/doc/src libs/filesystem/src libs/filesystem/test libs/filesystem/test/msvc10 libs/filesystem/v3
From: bdawes_at_[hidden]
Date: 2012-03-26 08:44:29

Author: bemandawes
Date: 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
New Revision: 77555
URL: http://svn.boost.org/trac/boost/changeset/77555

Log:
Filesystem - Delete v3 directories no longer needed. Cleanup links, namespaces, and other residue from dual v2/v3 support.
Removed:
   trunk/boost/filesystem/v3/
   trunk/libs/filesystem/v3/
Text files modified:
   trunk/boost/filesystem/convenience.hpp | 22 +------
   trunk/boost/filesystem/fstream.hpp | 32 +----------
   trunk/boost/filesystem/operations.hpp | 111 +--------------------------------------
   trunk/boost/filesystem/path.hpp | 40 +------------
   trunk/boost/filesystem/path_traits.hpp | 16 -----
   trunk/libs/filesystem/build/Jamfile.v2 | 15 +++-
   trunk/libs/filesystem/doc/deprecated.html | 8 +-
   trunk/libs/filesystem/doc/design.htm | 8 +-
   trunk/libs/filesystem/doc/faq.htm | 8 +-
   trunk/libs/filesystem/doc/index.htm | 60 +++++----------------
   trunk/libs/filesystem/doc/portability_guide.htm | 8 +-
   trunk/libs/filesystem/doc/reference.html | 16 ++--
   trunk/libs/filesystem/doc/release_history.html | 10 +-
   trunk/libs/filesystem/doc/src/boost_snippets.html | 8 +-
   trunk/libs/filesystem/doc/src/build.bat | 4
   trunk/libs/filesystem/doc/src/source.html | 14 ++--
   trunk/libs/filesystem/doc/src/tr2_snippets.html | 6 +
   trunk/libs/filesystem/doc/tutorial.html | 12 ++--
   trunk/libs/filesystem/doc/v3.html | 8 +-
   trunk/libs/filesystem/doc/v3_design.html | 8 +-
   trunk/libs/filesystem/index.html | 5 -
   trunk/libs/filesystem/src/codecvt_error_category.cpp | 17 +----
   trunk/libs/filesystem/src/operations.cpp | 30 +++-------
   trunk/libs/filesystem/src/path.cpp | 50 ++++++++---------
   trunk/libs/filesystem/src/path_traits.cpp | 21 ++-----
   trunk/libs/filesystem/src/portability.cpp | 19 +-----
   trunk/libs/filesystem/src/unique_path.cpp | 15 +----
   trunk/libs/filesystem/src/windows_file_codecvt.cpp | 10 ---
   trunk/libs/filesystem/src/windows_file_codecvt.hpp | 2
   trunk/libs/filesystem/test/Jamfile.v2 | 24 +++----
   trunk/libs/filesystem/test/convenience_test.cpp | 20 +++---
   trunk/libs/filesystem/test/deprecated_test.cpp | 8 +-
   trunk/libs/filesystem/test/fstream_test.cpp | 14 ++--
   trunk/libs/filesystem/test/large_file_support_test.cpp | 11 +--
   trunk/libs/filesystem/test/long_path_test.cpp | 2
   trunk/libs/filesystem/test/msvc10/common.props | 4
   trunk/libs/filesystem/test/operations_test.cpp | 17 ++---
   trunk/libs/filesystem/test/operations_unit_test.cpp | 13 ++--
   trunk/libs/filesystem/test/path_test.cpp | 19 ++---
   trunk/libs/filesystem/test/path_unit_test.cpp | 9 --
   trunk/libs/filesystem/test/test_codecvt.hpp | 2
   41 files changed, 217 insertions(+), 509 deletions(-)

Modified: trunk/boost/filesystem/convenience.hpp
==============================================================================
--- trunk/boost/filesystem/convenience.hpp (original)
+++ trunk/boost/filesystem/convenience.hpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -19,14 +19,14 @@
# 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

namespace boost
{
- namespace filesystem3
+ namespace filesystem
{

# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
@@ -51,24 +51,8 @@
# endif

- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost

-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::extension;
- using filesystem3::basename;
- using filesystem3::change_extension;
-# endif
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_CONVENIENCE_HPP

Modified: trunk/boost/filesystem/fstream.hpp
==============================================================================
--- trunk/boost/filesystem/fstream.hpp (original)
+++ trunk/boost/filesystem/fstream.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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>

@@ -36,7 +36,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{

//--------------------------------------------------------------------------------------//
@@ -175,34 +175,8 @@
 typedef basic_ofstream<wchar_t> wofstream;
 typedef basic_fstream<wchar_t> wfstream;

-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost

-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::filebuf;
- using filesystem3::ifstream;
- using filesystem3::ofstream;
- using filesystem3::fstream;
- using filesystem3::wfilebuf;
- using filesystem3::wifstream;
- using filesystem3::wfstream;
- using filesystem3::wofstream;
- using filesystem3::basic_filebuf;
- using filesystem3::basic_ifstream;
- using filesystem3::basic_ofstream;
- using filesystem3::basic_fstream;
-
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-# endif
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_FSTREAM_HPP

Modified: trunk/boost/filesystem/operations.hpp
==============================================================================
--- trunk/boost/filesystem/operations.hpp (original)
+++ trunk/boost/filesystem/operations.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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>
@@ -51,7 +51,7 @@

namespace boost
{
- namespace filesystem3
+ namespace filesystem
 {

//--------------------------------------------------------------------------------------//
@@ -1089,111 +1089,8 @@
 BOOST_FILESYSTEM_DECL bool possible_large_file_size_support();
 }

- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost

-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- // permissions
- using filesystem3::no_perms;
- using filesystem3::owner_read;
- using filesystem3::owner_write;
- using filesystem3::owner_exe;
- using filesystem3::owner_all;
- using filesystem3::group_read;
- using filesystem3::group_write;
- using filesystem3::group_exe;
- using filesystem3::group_all;
- using filesystem3::others_read;
- using filesystem3::others_write;
- using filesystem3::others_exe;
- using filesystem3::others_all;
- using filesystem3::all_all;
- using filesystem3::set_uid_on_exe;
- using filesystem3::set_gid_on_exe;
- using filesystem3::sticky_bit;
- using filesystem3::perms_mask;
- using filesystem3::perms_not_known;
- using filesystem3::add_perms;
- using filesystem3::remove_perms;
- using filesystem3::symlink_perms;
-
- using filesystem3::absolute;
- using filesystem3::block_file;
- using filesystem3::canonical;
- using filesystem3::character_file;
-// using filesystem3::copy;
- using filesystem3::copy_file;
- using filesystem3::copy_option;
- using filesystem3::copy_symlink;
- using filesystem3::create_directories;
- using filesystem3::create_directory;
- using filesystem3::create_hard_link;
- using filesystem3::create_symlink;
- using filesystem3::create_directory_symlink;
- using filesystem3::current_path;
- using filesystem3::directory_entry;
- using filesystem3::directory_file;
- using filesystem3::directory_iterator;
- using filesystem3::equivalent;
- using filesystem3::exists;
- using filesystem3::fifo_file;
- using filesystem3::file_not_found;
- using filesystem3::file_size;
- using filesystem3::file_status;
- using filesystem3::file_type;
- using filesystem3::filesystem_error;
- using filesystem3::hard_link_count;
- using filesystem3::initial_path;
- using filesystem3::is_directory;
- using filesystem3::is_directory;
- using filesystem3::is_empty;
- using filesystem3::is_other;
- using filesystem3::is_regular_file;
- using filesystem3::is_symlink;
- using filesystem3::last_write_time;
- using filesystem3::permissions;
- using filesystem3::permissions_present;
- using filesystem3::perms;
- using filesystem3::read_symlink;
- using filesystem3::recursive_directory_iterator;
- using filesystem3::regular_file;
- using filesystem3::reparse_file;
- using filesystem3::remove;
- using filesystem3::remove_all;
- using filesystem3::rename;
- using filesystem3::resize_file;
- using filesystem3::socket_file;
- using filesystem3::space;
- using filesystem3::space_info;
- using filesystem3::status;
- using filesystem3::status_error;
- using filesystem3::status_known;
- using filesystem3::symlink_file;
- using filesystem3::symlink_option;
- using filesystem3::symlink_status;
- using filesystem3::system_complete;
- using filesystem3::temp_directory_path;
- using filesystem3::type_present;
- using filesystem3::type_unknown;
- using filesystem3::unique_path;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::is_regular;
- using filesystem3::status_unknown;
- using filesystem3::symbolic_link_exists;
- //using filesystem3::wdirectory_iterator;
- //using filesystem3::wdirectory_entry;
-# endif
- namespace detail
- {
- using filesystem3::detail::possible_large_file_size_support;
- }
- }
-}
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_OPERATIONS_HPP

Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp (original)
+++ trunk/boost/filesystem/path.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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>
@@ -43,7 +43,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{
 //------------------------------------------------------------------------------------//
 // //
@@ -516,7 +516,7 @@
 {
 private:
 friend class boost::iterator_core_access;
- friend class boost::filesystem3::path;
+ friend class boost::filesystem::path;
 friend void m_path_iterator_increment(path::iterator & it);
 friend void m_path_iterator_decrement(path::iterator & it);

@@ -718,41 +718,11 @@
 { return generic_wstring(cvt); }

-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost

//----------------------------------------------------------------------------//

-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::path;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::wpath;
-# endif
- using filesystem3::lexicographical_compare;
- using filesystem3::portable_posix_name;
- using filesystem3::windows_name;
- using filesystem3::portable_name;
- using filesystem3::portable_directory_name;
- using filesystem3::portable_file_name;
- using filesystem3::native;
- using filesystem3::swap;
- using filesystem3::operator<;
- using filesystem3::operator==;
- using filesystem3::operator!=;
- using filesystem3::operator>;
- using filesystem3::operator<=;
- using filesystem3::operator>=;
- using filesystem3::operator/;
- using filesystem3::operator<<;
- using filesystem3::operator>>;
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas

#endif // BOOST_FILESYSTEM_PATH_HPP

Modified: trunk/boost/filesystem/path_traits.hpp
==============================================================================
--- trunk/boost/filesystem/path_traits.hpp (original)
+++ trunk/boost/filesystem/path_traits.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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>
@@ -32,7 +32,7 @@

#include <boost/config/abi_prefix.hpp> // must be the last #include

-namespace boost { namespace filesystem3 {
+namespace boost { namespace filesystem {

BOOST_FILESYSTEM_DECL const system::error_category& codecvt_error_category();
// uses std::codecvt_base::result used for error codes:
@@ -230,18 +230,6 @@

}}} // namespace boost::filesystem::path_traits

-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::codecvt_error_category;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-# endif
- }
-}
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas

#endif // BOOST_FILESYSTEM_PATH_TRAITS_HPP

Modified: trunk/libs/filesystem/build/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/build/Jamfile.v2 (original)
+++ trunk/libs/filesystem/build/Jamfile.v2 2012-03-26 08:44:24 EDT (Mon, 26 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 ;

Modified: trunk/libs/filesystem/doc/deprecated.html
==============================================================================
--- trunk/libs/filesystem/doc/deprecated.html (original)
+++ trunk/libs/filesystem/doc/deprecated.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem Deprecated Features</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Deprecated Features
 </td>
@@ -373,7 +373,7 @@

<hr>
Revised
-20 February, 2011
+20 March, 2012

© Copyright Beman Dawes, 2002-2005, 2010
 Use, modification, and distribution are subject to the Boost Software

Modified: trunk/libs/filesystem/doc/design.htm
==============================================================================
--- trunk/libs/filesystem/doc/design.htm (original)
+++ trunk/libs/filesystem/doc/design.htm 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,13 +6,13 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Boost Filesystem Library Design</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body bgcolor="#FFFFFF">

<h1>
-<img border="0" src="../../../../boost.png" align="center" width="277" height="86">Filesystem
+<img border="0" src="../../../boost.png" align="center" width="277" height="86">Filesystem
Library Design</h1>

Introduction 
@@ -340,11 +340,11 @@

<hr>
Revised
-18 February, 2010
+20 March, 2012

© Copyright Beman Dawes, 2002
 Use, modification, and distribution are subject to the Boost Software
-License, Version 1.0. (See accompanying file <a href="../../../../LICENSE_1_0.txt">
+License, Version 1.0. (See accompanying file <a href="../../../LICENSE_1_0.txt">
LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
www.boost.org/LICENSE_1_0.txt</a>)

Modified: trunk/libs/filesystem/doc/faq.htm
==============================================================================
--- trunk/libs/filesystem/doc/faq.htm (original)
+++ trunk/libs/filesystem/doc/faq.htm 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem FAQ</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem FAQ
 </td>
@@ -140,7 +140,7 @@
free functions.
<hr>
Revised
-20 February, 2011
+20 March, 2012
© Copyright Beman Dawes, 2002
 Use, modification, and distribution are subject to the Boost Software
License, Version 1.0. See <a href="http://www.boost.org/LICENSE_1_0.txt">

Modified: trunk/libs/filesystem/doc/index.htm
==============================================================================
--- trunk/libs/filesystem/doc/index.htm (original)
+++ trunk/libs/filesystem/doc/index.htm 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem Home</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Library 
 Version 3
@@ -66,41 +66,9 @@
 <table border="1" cellpadding="10" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td>
- This is the home page for Version 3 of the Filesystem library.
- Version 3 is a major revision with many new and improved
- features. It may, however, break some user code written for Version 2.
- To ease the transition, Boost releases 1.44 through 1.47
- will supply both V2 and V3. Version 2
- is the default version for Boost release 1.44
- and 1.45. Version 3 will be the default starting with release 1.46.
- Define macro BOOST_FILESYSTEM_VERSION as 3 to use
- Version 3. This will be the default for release 1.46 and later.
- Define macro BOOST_FILESYSTEM_VERSION as 2 to use
- Version 2. This is the default for release 1.44 and 1.45.
- You may define the BOOST_FILESYSTEM_VERSION macro:
- <ul>
- <li>
- On the build command line; the exact format depends on
- your compiler or IDE
- </li>
- <li>
- In your code, before including any filesystem header,
- #define BOOST_FILESYSTEM_VERSION n
- </li>
- <li>
- #define BOOST_FILESYSTEM_VERSION n in boost/config/user.hpp.
- Note that this approach applies to all uses of Boost.Filesystem.
- </li>
- </ul>
- Existing code should be moved to Version 3 as soon as
- convenient. New code should be written for Version 3.
- Version 2 is deprecated, and will not be included in Boost
- releases 1.48 and later.
- Building the library
- By default, the Boost build system creates libraries that
- support both version 2 and version 3. To support only a single version,
- include <code>--disable-filesystem2</code> or <code>--disable-filesystem3</code>
- on the <code>bjam</code> command line.
+ This is Version 3 of the Filesystem library. Version 2 is
+ not longer supported. 1.49.0 was the last release of Boost to supply
+ Version 2
 </td>
 </tr>
 </table>
@@ -255,7 +223,7 @@
though the error condition leading to the exception is not explicitly specified
in the function's "Throws" paragraph.
All exceptions thrown by the Filesystem
-Library are implemented by calling <a href="../../../utility/throw_exception.html">
+Library are implemented by calling <a href="../../utility/throw_exception.html">
boost::throw_exception()</a>. Thus exact behavior may differ depending on
BOOST_NO_EXCEPTIONS at the time the filesystem source files are compiled.
Non-throwing versions are provided of several functions that are often used
@@ -266,10 +234,10 @@
The Boost.Filesystem library provides several headers:

<ul>
- <li>Header <boost/filesystem.hpp>
+ <li>Header <boost/filesystem.hpp>
 provides access to all features of the library, except file streams. 
 </li>
- <li>Header <boost/filesystem/fstream.hpp>
+ <li>Header <boost/filesystem/fstream.hpp>
 inherits the same components as the C++ Standard
 Library's fstream header, but files are identified by <code>const path&</code>
 arguments rather that <code>const char*</code> arguments.</li>
@@ -280,8 +248,8 @@
The programs used to generate the Boost regression test status tables use the
Filesystem Library extensively.  See:
<ul>
- <li>process_jam_log.cpp</li>
- <li>compiler_status.cpp</li>
+ <li>process_jam_log.cpp</li>
+ <li>compiler_status.cpp</li>
</ul>
<h2><a name="Implementation">Implementation</a></h2>
The current implementation supports operating systems which provide
@@ -323,12 +291,12 @@
<h2><a name="Building">Building</a> the object-library</h2>
The object-library will be built automatically if you are using the Boost
build system. See
-Getting Started. It can also be
+Getting Started. It can also be
built manually using a Jamfile
supplied in directory libs/filesystem/build, or the user can construct an IDE
project or make file which includes the object-library source files.
The object-library source files are
-supplied in directory libs/filesystem/src. These source files implement the
+supplied in directory libs/filesystem/src. These source files implement the
library for POSIX or Windows compatible operating systems; no implementation is
supplied for other operating systems. Note that many operating systems not
normally thought of as POSIX systems, such as mainframe legacy
@@ -483,7 +451,7 @@

<hr>
Revised
-20 February, 2011
+20 March, 2012

© Copyright Beman Dawes, 2002-2005
 Use, modification, and distribution are subject to the Boost Software

Modified: trunk/libs/filesystem/doc/portability_guide.htm
==============================================================================
--- trunk/libs/filesystem/doc/portability_guide.htm (original)
+++ trunk/libs/filesystem/doc/portability_guide.htm 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,13 +6,13 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Portability Guide</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body bgcolor="#FFFFFF">

<h1>
-<img border="0" src="../../../../boost.png" align="center" width="300" height="86">Path
+<img border="0" src="../../../boost.png" align="center" width="300" height="86">Path
Name Portability
Guide</h1>

@@ -228,11 +228,11 @@

<hr>
Revised
-20 February, 2011
+20 March, 2012

© Copyright Beman Dawes, 2002, 2003
 Use, modification, and distribution are subject to the Boost Software
-License, Version 1.0. (See accompanying file <a href="../../../../LICENSE_1_0.txt">
+License, Version 1.0. (See accompanying file <a href="../../../LICENSE_1_0.txt">
LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
www.boost.org/LICENSE_1_0.txt</a>)

Modified: trunk/libs/filesystem/doc/reference.html
==============================================================================
--- trunk/libs/filesystem/doc/reference.html (original)
+++ trunk/libs/filesystem/doc/reference.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -42,8 +42,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Library 
 
@@ -1330,7 +1330,7 @@
 for two paths, <code>p1 == p2</code> then
 <code>hash_value(p1) == hash_value(p2)</code>.
 This allows paths to be used with
- Boost.Hash.
+ Boost.Hash.
</blockquote>
<pre>bool operator< (const path& lhs, const path& rhs);</pre>
<blockquote>
@@ -1388,7 +1388,7 @@
</pre>
<blockquote>
 Effects: 
- <code>os << <a href="../../../io/doc/quoted_manip.html">
+ <code>os << <a href="../../io/doc/quoted_manip.html">
 boost::io::quoted</a>(p.string<std::basic_string<Char>>(), static_cast<Char>('&'));</code>
 Returns:
 <code>os</code>
@@ -1401,7 +1401,7 @@
 Effects:  
 <code> std::basic_string<Char> str; 
        is >>
- boost::io::quoted(str,
+ boost::io::quoted(str,
 static_cast<Char>('&')); 
        p = str;</code>
 Returns:
@@ -2609,7 +2609,7 @@
</blockquote>

<pre>const path& <a name="initial_path">initial_path</a>();
-const path& <a name="initial_path">initial_path</a>(<code>system::error_code& ec</code>);</pre>
+const path& <a name="initial_path2">initial_path</a>(<code>system::error_code& ec</code>);</pre>
<blockquote>
 Returns:
 <code>current_path()</code> as of the first call to <code>initial_path()</code>.
@@ -3062,7 +3062,7 @@
</blockquote>

<h3><a name="File-streams">File streams</a> -
-<boost/filesystem/fstream.hpp></h3>
+<boost/filesystem/fstream.hpp></h3>
Replacements are provided for the file stream classes from the C++ standard
library's <code><fstream></code> header. These replacement classes
publicly inherit from the standard library classes. In the Boost.Filesystem
@@ -3700,7 +3700,7 @@

<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>
Revised
-13 January 2012
+20 March 2012

</body>

Modified: trunk/libs/filesystem/doc/release_history.html
==============================================================================
--- trunk/libs/filesystem/doc/release_history.html (original)
+++ trunk/libs/filesystem/doc/release_history.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem Release History</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Release History
 </td>
@@ -24,7 +24,7 @@

<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" bgcolor="#D7EEFF" width="100%">
 <tr>
- <td>Boost Home   
+ <td>Boost Home   
 <a href="index.htm">Library Home</a>    <a href="reference.html">Reference</a>   
 <a href="tutorial.html">Tutorial</a>   
 <a href="faq.htm">FAQ</a>   
@@ -123,7 +123,7 @@
</ul>
<hr>
Revised
-17 March, 2012
+20 March, 2012
© Copyright Beman Dawes, 2011
 Use, modification, and distribution are subject to the Boost Software
License, Version 1.0. See <a href="http://www.boost.org/LICENSE_1_0.txt">

Modified: trunk/libs/filesystem/doc/src/boost_snippets.html
==============================================================================
--- trunk/libs/filesystem/doc/src/boost_snippets.html (original)
+++ trunk/libs/filesystem/doc/src/boost_snippets.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -13,8 +13,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Library 
 
@@ -52,7 +52,7 @@

$id wording_suffix=
<h3><a name="File-streams">File streams</a> -
-<boost/filesystem/fstream.hpp></h3>
+<boost/filesystem/fstream.hpp></h3>
Replacements are provided for the file stream classes from the C++ standard
library's <code><fstream></code> header. These replacement classes
publicly inherit from the standard library classes. In the Boost.Filesystem
@@ -115,7 +115,7 @@

<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>
Revised
-13 January 2012
+20 March 2012

$endid

Modified: trunk/libs/filesystem/doc/src/build.bat
==============================================================================
--- trunk/libs/filesystem/doc/src/build.bat (original)
+++ trunk/libs/filesystem/doc/src/build.bat 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -1,5 +1,5 @@
@echo off
-del tr2.html >nul
+del tr2.html 2>nul
mmp TARGET=TR2 source.html tr2.html
-del reference.html >nul
+del reference.html 2>nul
mmp TARGET=BOOST source.html reference.html

Modified: trunk/libs/filesystem/doc/src/source.html
==============================================================================
--- trunk/libs/filesystem/doc/src/source.html (original)
+++ trunk/libs/filesystem/doc/src/source.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -1,5 +1,7 @@
<html>
-
+
+
+
<head>
<meta http-equiv="Content-Language" content="en-us">
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
@@ -32,7 +34,7 @@
$endif
</title>
<style type="text/css">
-$include "../../../../../doc/src/minimal.css"
+$include "../../../../doc/src/minimal.css"
</style>
</head>

@@ -1287,7 +1289,7 @@
 for two paths, <code>p1 == p2</code> then
 <code>hash_value(p1) == hash_value(p2)</code>.
 This allows paths to be used with
- Boost.Hash.
+ Boost.Hash.
</blockquote>
<pre>bool operator< (const path& lhs, const path& rhs);</pre>
<blockquote>
@@ -1345,7 +1347,7 @@
</pre>
<blockquote>
 Effects: 
- <code>os << <a href="../../../io/doc/quoted_manip.html">
+ <code>os << <a href="../../io/doc/quoted_manip.html">
 boost::io::quoted</a>(p.string<std::basic_string<Char>>(), static_cast<Char>('&'));</code>
 Returns:
 <code>os</code>
@@ -1358,7 +1360,7 @@
 Effects:  
 <code> std::basic_string<Char> str; 
        is >>
- boost::io::quoted(str,
+ boost::io::quoted(str,
 static_cast<Char>('&')); 
        p = str;</code>
 Returns:
@@ -2546,7 +2548,7 @@
</blockquote>

<pre>const path& <a name="initial_path">initial_path</a>();
-const path& <a name="initial_path">initial_path</a>(<code>system::error_code& ec</code>);</pre>
+const path& <a name="initial_path2">initial_path</a>(<code>system::error_code& ec</code>);</pre>
<blockquote>
 Returns:
 <code>current_path()</code> as of the first call to <code>initial_path()</code>.

Modified: trunk/libs/filesystem/doc/src/tr2_snippets.html
==============================================================================
--- trunk/libs/filesystem/doc/src/tr2_snippets.html (original)
+++ trunk/libs/filesystem/doc/src/tr2_snippets.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -1,5 +1,7 @@
<html>
-
+
+
+
<head>
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
@@ -18,7 +20,7 @@
 <tr>
 <td width="153" align="left" valign="top">Date:</td>
 <td width="426">
- 2012-03-16</td>
+ 2012-03-20</td>
 </tr>
 <tr>
 <td width="153" align="left" valign="top">Project:</td>

Modified: trunk/libs/filesystem/doc/tutorial.html
==============================================================================
--- trunk/libs/filesystem/doc/tutorial.html (original)
+++ trunk/libs/filesystem/doc/tutorial.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem Tutorial</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem Tutorial
 </td>
@@ -158,7 +158,7 @@
like this:

<blockquote>
- <pre>uintmax_t <a name="file_size">file_size</a>(const path& p);</pre>
+ <pre>uintmax_t file_size(const path& p);</pre>
</blockquote>
For now, all you need to know is that class path has constructors that take
<code>const char *</code> and many other useful types. (If you can't wait to
@@ -1095,7 +1095,7 @@
 operational error. <code>filesystem_error</code> is derived from <code>std::runtime_error</code>.
It has a
 member function to obtain the <code>
-error_code</code> reported by the source
+error_code</code> reported by the source
 of the error. It also has member functions to obtain the path or paths that caused
 the error.

@@ -1121,7 +1121,7 @@
Distributed under the Boost Software License, Version 1.0. See
<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>
Revised
-20 February 2011
+20 March 2012

</body>

Modified: trunk/libs/filesystem/doc/v3.html
==============================================================================
--- trunk/libs/filesystem/doc/v3.html (original)
+++ trunk/libs/filesystem/doc/v3.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -5,15 +5,15 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem V3 Intro</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">

<body>

<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td width="277">
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" width="300" height="86" border="0"></a></td>
 <td align="middle">
 Filesystem
 Version 3 
@@ -144,7 +144,7 @@
Distributed under the Boost Software License, Version 1.0. See
<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>
Revised
-20 February 2011
+20 March 2012

</body>

Modified: trunk/libs/filesystem/doc/v3_design.html
==============================================================================
--- trunk/libs/filesystem/doc/v3_design.html (original)
+++ trunk/libs/filesystem/doc/v3_design.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -6,7 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Filesystem V3 Design</title>
-<link rel="stylesheet" type="text/css" href="../../../../doc/src/minimal.css">
+<link rel="stylesheet" type="text/css" href="../../../doc/src/minimal.css">
</head>

<body>
@@ -14,8 +14,8 @@
<table border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td>
-<a href="../../../../index.htm">
-<img src="../../../../boost.png" alt="boost.png (6897 bytes)" align="middle" border="0" width="300" height="86"></a></td>
+<a href="../../../index.htm">
+<img src="../../../boost.png" alt="boost.png (6897 bytes)" align="middle" border="0" width="300" height="86"></a></td>
 <td align="middle">
 Filesystem Version 3 
 Design</td>
@@ -180,7 +180,7 @@

<hr>
Revised
-20 February, 2011
+20 March, 2012

Â© Copyright Beman Dawes, 2008
 Use, modification, and distribution are subject to the Boost Software

Modified: trunk/libs/filesystem/index.html
==============================================================================
--- trunk/libs/filesystem/index.html (original)
+++ trunk/libs/filesystem/index.html 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -7,8 +7,7 @@
<a href="doc/index.htm">doc/index.htm</a>.
<hr>
© Copyright Beman Dawes, 2003
- Distributed under the Boost Software
-License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
-www.boost.org/LICENSE_1_0.txt</a>)
+ Distributed under the Boost Software License, Version 1.0.
+See http://www.boost.org/LICENSE_1_0.txt>
</body>
</html>

Modified: trunk/libs/filesystem/src/codecvt_error_category.cpp
==============================================================================
--- trunk/libs/filesystem/src/codecvt_error_category.cpp (original)
+++ trunk/libs/filesystem/src/codecvt_error_category.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -9,13 +9,6 @@

//--------------------------------------------------------------------------------------//

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
#include <boost/config/warning_disable.hpp>

// define BOOST_FILESYSTEM_SOURCE so that <boost/filesystem/config.hpp> knows
@@ -26,8 +19,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>
@@ -78,7 +71,7 @@

namespace boost
{
- namespace filesystem3
+ namespace filesystem
 {

 BOOST_FILESYSTEM_DECL const boost::system::error_category& codecvt_error_category()
@@ -87,7 +80,5 @@
 return codecvt_error_cat_const;
 }

- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
-
-#endif // no wide character support

Modified: trunk/libs/filesystem/src/operations.cpp
==============================================================================
--- trunk/libs/filesystem/src/operations.cpp (original)
+++ trunk/libs/filesystem/src/operations.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -29,16 +29,8 @@
#define _FILE_OFFSET_BITS 64
#endif

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
// define BOOST_FILESYSTEM_SOURCE so that <boost/filesystem/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
-
#define BOOST_FILESYSTEM_SOURCE

#ifndef BOOST_SYSTEM_NO_DEPRECATED
@@ -49,7 +41,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>
@@ -66,10 +58,10 @@
# include <iostream>
#endif

-namespace fs = boost::filesystem3;
-using boost::filesystem3::path;
-using boost::filesystem3::filesystem_error;
-using boost::filesystem3::perms;
+namespace fs = boost::filesystem;
+using boost::filesystem::path;
+using boost::filesystem::filesystem_error;
+using boost::filesystem::perms;
using boost::system::error_code;
using boost::system::error_category;
using boost::system::system_category;
@@ -251,7 +243,7 @@

 fs::file_type query_file_type(const path& p, error_code* ec);

- boost::filesystem3::directory_iterator end_dir_itr;
+ boost::filesystem::directory_iterator end_dir_itr;

 const std::size_t buf_size(128);
 const error_code ok;
@@ -707,7 +699,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{

 BOOST_FILESYSTEM_DECL
@@ -1860,7 +1852,7 @@
 }

} // namespace path_traits
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost

//--------------------------------------------------------------------------------------//
@@ -2083,7 +2075,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{

namespace detail
@@ -2203,7 +2195,5 @@
 }
 }
} // namespace detail
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
-
-#endif // no wide character support

Modified: trunk/libs/filesystem/src/path.cpp
==============================================================================
--- trunk/libs/filesystem/src/path.cpp (original)
+++ trunk/libs/filesystem/src/path.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -7,12 +7,12 @@

// Library home page: http://www.boost.org/libs/filesystem

+// Old standard library configurations, particularly MingGW, don't support wide strings.
+// Report this with an explicit error message.
#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif

// define BOOST_FILESYSTEM_SOURCE so that <boost/system/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
@@ -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>
@@ -44,9 +44,9 @@
# include <iomanip>
#endif

-namespace fs = boost::filesystem3;
+namespace fs = boost::filesystem;

-using boost::filesystem3::path;
+using boost::filesystem::path;

using std::string;
using std::wstring;
@@ -140,7 +140,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{
 path& path::operator/=(const path& p)
 {
@@ -439,7 +439,7 @@
 return *this;
 }

-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost

//--------------------------------------------------------------------------------------//
@@ -520,16 +520,16 @@
 && is_separator(path[1])) return string_type::npos;

# ifdef BOOST_WINDOWS_API
- // case "\\?\"
- if (size > 4
- && is_separator(path[0])
- && is_separator(path[1])
- && path[2] == questionmark
- && is_separator(path[3]))
- {
- string_type::size_type pos(path.find_first_of(separators, 4));
+ // case "\\?\"
+ if (size > 4
+ && is_separator(path[0])
+ && is_separator(path[1])
+ && path[2] == questionmark
+ && is_separator(path[3]))
+ {
+ string_type::size_type pos(path.find_first_of(separators, 4));
 return pos < size ? pos : string_type::npos;
- }
+ }
# endif

 // case "//net {/}"
@@ -624,7 +624,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{
 path::iterator path::begin() const
 {
@@ -738,7 +738,7 @@
 it.m_element.m_pathname = separator_string; // generic format; see docs
 }

-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost

//--------------------------------------------------------------------------------------//
@@ -812,7 +812,7 @@

namespace boost
{
-namespace filesystem3
+namespace filesystem
{

 const path::codecvt_type*& path::wchar_t_codecvt_facet()
@@ -837,7 +837,5 @@
 return temp;
 }

-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
-
-#endif // has wide character support

Modified: trunk/libs/filesystem/src/path_traits.cpp
==============================================================================
--- trunk/libs/filesystem/src/path_traits.cpp (original)
+++ trunk/libs/filesystem/src/path_traits.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -9,13 +9,6 @@

//--------------------------------------------------------------------------------------//

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
// define BOOST_FILESYSTEM_SOURCE so that <boost/system/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
#define BOOST_FILESYSTEM_SOURCE
@@ -24,16 +17,16 @@
# 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
#include <cstring> // for strlen
#include <cwchar> // for wcslen

-namespace pt = boost::filesystem3::path_traits;
-namespace fs = boost::filesystem3;
+namespace pt = boost::filesystem::path_traits;
+namespace fs = boost::filesystem;
namespace bs = boost::system;

//--------------------------------------------------------------------------------------//
@@ -130,7 +123,7 @@
// path_traits //
//--------------------------------------------------------------------------------------//

-namespace boost { namespace filesystem3 { namespace path_traits {
+namespace boost { namespace filesystem { namespace path_traits {

//--------------------------------------------------------------------------------------//
// convert const char* to wstring //
@@ -204,6 +197,4 @@
 convert_aux(from, from_end, buf, buf+default_codecvt_buf_size, to, cvt);
 }
 }
-}}} // namespace boost::filesystem3::path_traits
-
-#endif // no wide character support
+}}} // namespace boost::filesystem::path_traits

Modified: trunk/libs/filesystem/src/portability.cpp
==============================================================================
--- trunk/libs/filesystem/src/portability.cpp (original)
+++ trunk/libs/filesystem/src/portability.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -9,13 +9,6 @@

//--------------------------------------------------------------------------------------//

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
// define BOOST_FILESYSTEM_SOURCE so that <boost/filesystem/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
#define BOOST_FILESYSTEM_SOURCE
@@ -24,10 +17,10 @@
# 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;
+namespace fs = boost::filesystem;

#include <cstring> // SGI MIPSpro compilers need this

@@ -54,7 +47,7 @@

namespace boost
{
- namespace filesystem3
+ namespace filesystem
 {

 // name_check functions ----------------------------------------------//
@@ -122,7 +115,5 @@
 ;
 }

- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
-
-#endif // no wide character support

Modified: trunk/libs/filesystem/src/unique_path.cpp
==============================================================================
--- trunk/libs/filesystem/src/unique_path.cpp (original)
+++ trunk/libs/filesystem/src/unique_path.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -1,4 +1,4 @@
-// filesystem system_crypt_random.cpp ------------------------------------------------//
+// filesystem unique_path.cpp --------------------------------------------------------//

// Copyright Beman Dawes 2010

@@ -9,13 +9,6 @@

//--------------------------------------------------------------------------------------//

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
// define BOOST_FILESYSTEM_SOURCE so that <boost/filesystem/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
#define BOOST_FILESYSTEM_SOURCE
@@ -24,7 +17,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>
@@ -112,7 +105,7 @@

} // unnamed namespace

-namespace boost { namespace filesystem3 { namespace detail {
+namespace boost { namespace filesystem { namespace detail {

BOOST_FILESYSTEM_DECL
path unique_path(const path& model, system::error_code* ec)
@@ -147,5 +140,3 @@
}

}}}
-
-#endif // no wide character support

Modified: trunk/libs/filesystem/src/windows_file_codecvt.cpp
==============================================================================
--- trunk/libs/filesystem/src/windows_file_codecvt.cpp (original)
+++ trunk/libs/filesystem/src/windows_file_codecvt.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -9,13 +9,6 @@

//--------------------------------------------------------------------------------------//

-#include <boost/config.hpp>
-#if !defined( BOOST_NO_STD_WSTRING )
-// Boost.Filesystem V3 and later requires std::wstring support.
-// During the transition to V3, libraries are compiled with both V2 and V3 sources.
-// On old compilers that don't support V3 anyhow, we just skip everything so the compile
-// will succeed and the library can be built.
-
// define BOOST_FILESYSTEM_SOURCE so that <boost/system/config.hpp> knows
// the library is being built (possibly exporting rather than importing code)
#define BOOST_FILESYSTEM_SOURCE
@@ -24,7 +17,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
@@ -80,4 +73,3 @@

# endif // BOOST_WINDOWS_API

-#endif // no wide character support

Modified: trunk/libs/filesystem/src/windows_file_codecvt.hpp
==============================================================================
--- trunk/libs/filesystem/src/windows_file_codecvt.hpp (original)
+++ trunk/libs/filesystem/src/windows_file_codecvt.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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: trunk/libs/filesystem/test/Jamfile.v2
==============================================================================
--- trunk/libs/filesystem/test/Jamfile.v2 (original)
+++ trunk/libs/filesystem/test/Jamfile.v2 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -2,7 +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

project
 : requirements
@@ -15,21 +15,19 @@
# to know if failures in shared library tests are related to sharing or not.

 test-suite "filesystem" :
- [ run path_unit_test.cpp : : : <link>shared ]
- [ run path_unit_test.cpp : : : <link>static : path_unit_test_static ]
- [ run path_test.cpp : : : <link>shared ]
- [ run path_test.cpp : : : <link>static : path_test_static ]
- [ run operations_unit_test.cpp : : : <link>shared ]
- [ run operations_unit_test.cpp : : : <link>static : operations_unit_test_static ]
- [ run operations_test.cpp : : : <link>shared ]
- [ run operations_test.cpp : : : <link>static : operations_test_static ]
- [ run fstream_test.cpp ]
 [ run convenience_test.cpp ]
- [ run large_file_support_test.cpp ]
 [ run deprecated_test.cpp ]
+ [ run fstream_test.cpp ]
+ [ run large_file_support_test.cpp ]
+ [ run locale_info.cpp : : : <test-info>always_show_run_output ]
+ [ run operations_test.cpp : : : <link>shared <test-info>always_show_run_output ]
+# [ run operations_test.cpp : : : <link>static : operations_test_static ]
+ [ run operations_unit_test.cpp : : : <link>shared ]
+ [ run path_test.cpp : : : <link>shared ]
+# [ run path_test.cpp : : : <link>static : path_test_static ]
+ [ run path_unit_test.cpp : : : <link>shared ]
+# [ run path_unit_test.cpp : : : <link>static : path_unit_test_static ]
 [ run ../example/simple_ls.cpp ]
 [ run ../example/file_status.cpp ]

-# [ compile ../example/mbcopy.cpp ]
-# [ compile ../example/mbpath.cpp ]
 ;

Modified: trunk/libs/filesystem/test/convenience_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/convenience_test.cpp (original)
+++ trunk/libs/filesystem/test/convenience_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -8,14 +8,6 @@

// See library home page at http://www.boost.org/libs/filesystem

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif
-
#include <boost/config/warning_disable.hpp>

// See deprecated_test for tests of deprecated features
@@ -27,9 +19,11 @@
#endif

#include <boost/filesystem/convenience.hpp>
-namespace fs = boost::filesystem;
-using fs::path;
-namespace sys = boost::system;
+
+#include <boost/config.hpp>
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif

#include <boost/detail/lightweight_test.hpp>
#include <boost/detail/lightweight_main.hpp>
@@ -37,6 +31,10 @@
#include <fstream>
#include <iostream>

+namespace fs = boost::filesystem;
+using fs::path;
+namespace sys = boost::system;
+
namespace
{
template< typename F >

Modified: trunk/libs/filesystem/test/deprecated_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/deprecated_test.cpp (original)
+++ trunk/libs/filesystem/test/deprecated_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -11,17 +11,15 @@
// This test verifies that various deprecated names still work. This is
// important to preserve existing code that uses the old names.

-#define BOOST_FILESYSTEM_VERSION 3
+#define BOOST_FILESYSTEM_DEPRECATED

-#include <boost/config.hpp>
+#include <boost/filesystem.hpp>

+#include <boost/config.hpp>
# if defined( BOOST_NO_STD_WSTRING )
# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
# endif

-#define BOOST_FILESYSTEM_DEPRECATED
-
-#include <boost/filesystem.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/detail/lightweight_main.hpp>

Modified: trunk/libs/filesystem/test/fstream_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/fstream_test.cpp (original)
+++ trunk/libs/filesystem/test/fstream_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -7,14 +7,6 @@

// Library home page: http://www.boost.org/libs/filesystem

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif
-
#include <boost/config/warning_disable.hpp>

// See deprecated_test for tests of deprecated features
@@ -26,6 +18,12 @@
#endif

#include <boost/filesystem/fstream.hpp>
+
+#include <boost/config.hpp>
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif
+
#include <boost/filesystem/operations.hpp>
#include <string>
#include <iostream>

Modified: trunk/libs/filesystem/test/large_file_support_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/large_file_support_test.cpp (original)
+++ trunk/libs/filesystem/test/large_file_support_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -7,20 +7,17 @@

// See library home page at http://www.boost.org/libs/filesystem

+// See deprecated_test for tests of deprecated features
+#define BOOST_FILESYSTEM_NO_DEPRECATED
+#define BOOST_SYSTEM_NO_DEPRECATED

-#define BOOST_FILESYSTEM_VERSION 3
+#include <boost/filesystem/operations.hpp>

#include <boost/config.hpp>
-
# if defined( BOOST_NO_STD_WSTRING )
# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
# endif

-// See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
-#define BOOST_SYSTEM_NO_DEPRECATED
-
-#include <boost/filesystem/operations.hpp>
namespace fs = boost::filesystem;

#include <iostream>

Modified: trunk/libs/filesystem/test/long_path_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/long_path_test.cpp (original)
+++ trunk/libs/filesystem/test/long_path_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -9,8 +9,6 @@

// See http://msdn.microsoft.com/en-us/library/aa365247%28v=vs.85%29.aspx

-#define BOOST_FILESYSTEM_VERSION 3
-
#include <boost/config/warning_disable.hpp>

#include <boost/filesystem.hpp>

Modified: trunk/libs/filesystem/test/msvc10/common.props
==============================================================================
--- trunk/libs/filesystem/test/msvc10/common.props (original)
+++ trunk/libs/filesystem/test/msvc10/common.props 2012-03-26 08:44:24 EDT (Mon, 26 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: trunk/libs/filesystem/test/operations_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_test.cpp (original)
+++ trunk/libs/filesystem/test/operations_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -7,14 +7,6 @@

// Library home page: http://www.boost.org/libs/filesystem

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif
-
#include <boost/config/warning_disable.hpp>

// See deprecated_test for tests of deprecated features
@@ -26,12 +18,17 @@
#endif

#include <boost/filesystem/operations.hpp>
-#include <boost/cerrno.hpp>
-namespace fs = boost::filesystem;

+#include <boost/config.hpp>
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif
+
+#include <boost/cerrno.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/detail/lightweight_main.hpp>

+namespace fs = boost::filesystem;
using boost::system::error_code;
using boost::system::system_category;
using boost::system::system_error;

Modified: trunk/libs/filesystem/test/operations_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/operations_unit_test.cpp (original)
+++ trunk/libs/filesystem/test/operations_unit_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -13,13 +13,6 @@

// ------------------------------------------------------------------------------------//

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif

#include <boost/config/warning_disable.hpp>

@@ -32,6 +25,12 @@
#endif

#include <boost/filesystem.hpp> // make sure filesystem.hpp works
+
+#include <boost/config.hpp>
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif
+
#include <boost/system/error_code.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/detail/lightweight_main.hpp>

Modified: trunk/libs/filesystem/test/path_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/path_test.cpp (original)
+++ trunk/libs/filesystem/test/path_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -39,14 +39,6 @@
// //
//--------------------------------------------------------------------------------------//

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif
-
#include <boost/config/warning_disable.hpp>

// See deprecated_test for tests of deprecated features
@@ -58,6 +50,12 @@
#endif

#include <boost/filesystem/operations.hpp>
+
+#include <boost/config.hpp>
+# if defined( BOOST_NO_STD_WSTRING )
+# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
+# endif
+
#include <boost/utility.hpp>
#include <iostream>
#include <sstream>
@@ -65,13 +63,12 @@
#include <vector>
#include <cstring>
#include <cassert>
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/lightweight_main.hpp>

namespace fs = boost::filesystem;
using boost::filesystem::path;

-#include <boost/detail/lightweight_test.hpp>
-#include <boost/detail/lightweight_main.hpp>
-
#ifdef BOOST_WINDOWS_API
# define BOOST_DIR_SEP "\\"
#else

Modified: trunk/libs/filesystem/test/path_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/path_unit_test.cpp (original)
+++ trunk/libs/filesystem/test/path_unit_test.cpp 2012-03-26 08:44:24 EDT (Mon, 26 Mar 2012)
@@ -19,14 +19,6 @@
//
// ---------------------------------------------------------------------------------- //

-#define BOOST_FILESYSTEM_VERSION 3
-
-#include <boost/config.hpp>
-
-# if defined( BOOST_NO_STD_WSTRING )
-# error Configuration not supported: Boost.Filesystem V3 and later requires std::wstring support
-# endif
-
#include <boost/config/warning_disable.hpp>

// See deprecated_test for tests of deprecated features
@@ -38,6 +30,7 @@
#endif

#include <boost/filesystem/path.hpp>
+
#include <boost/filesystem/detail/utf8_codecvt_facet.hpp> // for imbue tests
#include "test_codecvt.hpp" // for codecvt arg tests
#include <boost/detail/lightweight_test.hpp>

Modified: trunk/libs/filesystem/test/test_codecvt.hpp
==============================================================================
--- trunk/libs/filesystem/test/test_codecvt.hpp (original)
+++ trunk/libs/filesystem/test/test_codecvt.hpp 2012-03-26 08:44:24 EDT (Mon, 26 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