Subject: [Boost-commit] svn:boost r66987 - in trunk: boost boost/filesystem libs/filesystem libs/filesystem/v2/doc libs/filesystem/v2/example libs/filesystem/v2/test libs/filesystem/v3/doc
From: bdawes_at_[hidden]
Date: 2010-12-03 13:17:03
Author: bemandawes
Date: 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
New Revision: 66987
URL: http://svn.boost.org/trac/boost/changeset/66987
Log:
Make V3 the default. Change docs accordingly. Partial fix for ticket #4897
Text files modified:
trunk/boost/filesystem.hpp | 2 +-
trunk/boost/filesystem/config.hpp | 2 +-
trunk/boost/filesystem/convenience.hpp | 2 +-
trunk/boost/filesystem/exception.hpp | 2 +-
trunk/boost/filesystem/fstream.hpp | 2 +-
trunk/boost/filesystem/operations.hpp | 2 +-
trunk/boost/filesystem/path.hpp | 2 +-
trunk/libs/filesystem/index.html | 4 ++--
trunk/libs/filesystem/v2/doc/index.htm | 21 +++++++++++++++------
trunk/libs/filesystem/v2/example/mbcopy.cpp | 2 ++
trunk/libs/filesystem/v2/example/mbpath.cpp | 2 ++
trunk/libs/filesystem/v2/example/simple_ls.cpp | 2 ++
trunk/libs/filesystem/v2/test/convenience_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/deprecated_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/fstream_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/large_file_support_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/operations_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/path_test.cpp | 2 ++
trunk/libs/filesystem/v2/test/wide_test.cpp | 2 ++
trunk/libs/filesystem/v3/doc/index.htm | 26 ++++++++++++++++----------
20 files changed, 60 insertions(+), 25 deletions(-)
Modified: trunk/boost/filesystem.hpp
==============================================================================
--- trunk/boost/filesystem.hpp (original)
+++ trunk/boost/filesystem.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/config.hpp
==============================================================================
--- trunk/boost/filesystem/config.hpp (original)
+++ trunk/boost/filesystem/config.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/convenience.hpp
==============================================================================
--- trunk/boost/filesystem/convenience.hpp (original)
+++ trunk/boost/filesystem/convenience.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/exception.hpp
==============================================================================
--- trunk/boost/filesystem/exception.hpp (original)
+++ trunk/boost/filesystem/exception.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/fstream.hpp
==============================================================================
--- trunk/boost/filesystem/fstream.hpp (original)
+++ trunk/boost/filesystem/fstream.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/operations.hpp
==============================================================================
--- trunk/boost/filesystem/operations.hpp (original)
+++ trunk/boost/filesystem/operations.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp (original)
+++ trunk/boost/filesystem/path.hpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -18,7 +18,7 @@
# endif
# if !defined(BOOST_FILESYSTEM_VERSION)
-# define BOOST_FILESYSTEM_VERSION 2
+# define BOOST_FILESYSTEM_VERSION 3
# endif
#if BOOST_FILESYSTEM_VERSION == 2
Modified: trunk/libs/filesystem/index.html
==============================================================================
--- trunk/libs/filesystem/index.html (original)
+++ trunk/libs/filesystem/index.html 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -4,11 +4,11 @@
</head>
<body>
Automatic redirection failed, please go to
-v2/doc/index.htm.
+v3/doc/index.htm.
<hr>
<p>© Copyright Beman Dawes, 2003</p>
<p> 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>)</p>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/libs/filesystem/v2/doc/index.htm
==============================================================================
--- trunk/libs/filesystem/v2/doc/index.htm (original)
+++ trunk/libs/filesystem/v2/doc/index.htm 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -74,13 +74,22 @@
<td>
<p align="center"><b>This is Version 2 of the Filesystem library.</b></p>
<p align="center">Version 3, a major revision with many new and improved
- features is also available, but breaks some existing code.</p>
- <p align="center">Version 2 is the default version for Boost release 1.44
- only. Version 3 will become the default starting with release 1.45.</p>
+ features, is also available. Version 3 may break some user code written
+ for Version 2.</p>
+ <p align="center">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.</p>
+ <p align="center"><b>Define macro BOOST_FILESYSTEM_VERSION as 3 to use Version 3. You may do this via a
+ compiler argument or via <code>#define BOOST_FILESYSTEM_VERSION 3</code>.
+ This will be the default for release 1.46 and later.</b></p>
+ <p align="center"><b>Define macro BOOST_FILESYSTEM_VERSION as 2 to use Version
+ 2. You may do this via a
+ compiler argument or via <code>#define BOOST_FILESYSTEM_VERSION 2</code>.
+ This is the default for release 1.44 and 1.45.</b></p>
<p align="center">Existing code should be moved to version 3 as soon as
convenient. New code should be written for version 3.</p>
- <p align="center">Version 2 is deprecated, and will be removed from Boost
- releases at the end of a transition period.</p>
+ <p align="center">Version 2 is deprecated, and will not be included in Boost
+ releases 1.48 and later.</p>
</td>
</tr>
</table>
@@ -797,7 +806,7 @@
<hr>
<p>Revised
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->21 June, 2010<!--webbot bot="Timestamp" endspan i-checksum="19840" --></p>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->03 December, 2010<!--webbot bot="Timestamp" endspan i-checksum="38634" --></p>
<p>© Copyright Beman Dawes, 2002-2005</p>
<p> Use, modification, and distribution are subject to the Boost Software
Modified: trunk/libs/filesystem/v2/example/mbcopy.cpp
==============================================================================
--- trunk/libs/filesystem/v2/example/mbcopy.cpp (original)
+++ trunk/libs/filesystem/v2/example/mbcopy.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -9,6 +9,8 @@
// Copy the files in a directory, using mbpath to represent the new file names
// See http://../doc/path.htm#mbpath for more information
+#define BOOST_FILESYSTEM_VERSION 2
+
// See deprecated_test for tests of deprecated features
#define BOOST_FILESYSTEM_NO_DEPRECATED
Modified: trunk/libs/filesystem/v2/example/mbpath.cpp
==============================================================================
--- trunk/libs/filesystem/v2/example/mbpath.cpp (original)
+++ trunk/libs/filesystem/v2/example/mbpath.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -8,6 +8,8 @@
// See Boost.Filesystem home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/filesystem/config.hpp>
# ifdef BOOST_FILESYSTEM2_NARROW_ONLY
# error This compiler or standard library does not support wide-character strings or paths
Modified: trunk/libs/filesystem/v2/example/simple_ls.cpp
==============================================================================
--- trunk/libs/filesystem/v2/example/simple_ls.cpp (original)
+++ trunk/libs/filesystem/v2/example/simple_ls.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -8,6 +8,8 @@
// See http://www.boost.org/libs/filesystem for documentation.
+#define BOOST_FILESYSTEM_VERSION 2
+
// As an example program, we don't want to use any deprecated features
#define BOOST_FILESYSTEM_NO_DEPRECATED
Modified: trunk/libs/filesystem/v2/test/convenience_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/convenience_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/convenience_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -8,6 +8,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: trunk/libs/filesystem/v2/test/deprecated_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/deprecated_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/deprecated_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -12,6 +12,8 @@
// This test verifies that various deprecated names still compile. This is
// important to preserve existing code that uses the old names.
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/filesystem.hpp>
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/filesystem/v2/test/fstream_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/fstream_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/fstream_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -7,6 +7,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: trunk/libs/filesystem/v2/test/large_file_support_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/large_file_support_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/large_file_support_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -7,6 +7,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
// See deprecated_test for tests of deprecated features
#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
# define BOOST_FILESYSTEM_NO_DEPRECATED
Modified: trunk/libs/filesystem/v2/test/operations_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/operations_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/operations_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -7,6 +7,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: trunk/libs/filesystem/v2/test/path_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/path_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/path_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -13,6 +13,8 @@
// on basename(), extension(), and change_extension() tests from the original
// convenience_test.cpp by Vladimir Prus.
+#define BOOST_FILESYSTEM_VERSION 2
+
// See deprecated_test for tests of deprecated features
#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
# define BOOST_FILESYSTEM_NO_DEPRECATED
Modified: trunk/libs/filesystem/v2/test/wide_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/wide_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/wide_test.cpp 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -8,6 +8,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 2
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: trunk/libs/filesystem/v3/doc/index.htm
==============================================================================
--- trunk/libs/filesystem/v3/doc/index.htm (original)
+++ trunk/libs/filesystem/v3/doc/index.htm 2010-12-03 13:17:01 EST (Fri, 03 Dec 2010)
@@ -66,18 +66,24 @@
<table border="1" cellpadding="10" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111">
<tr>
<td>
- <p align="center"><b>This is Version 3 of the Filesystem library.</b></p>
+ <p align="center"><b>This is the home page for Version 3 of the Filesystem library.</b></p>
<p align="center">Version 3 is a major revision with many new and improved
- features. It breaks some Version 2 code.</p>
- <p align="center">Version 2 is the default version for Boost release 1.44
- only. Version 3 will become the default starting with release 1.45.</p>
- <p align="center"><b>For this release only, you must define macro
- BOOST_FILESYSTEM_VERSION as 3 to use Version 3. You may do this via a
- compiler argument or via <code>#define BOOST_FILESYSTEM_VERSION 3</code></b></p>
+ features. It may, however, break some user code written for Version 2.</p>
+ <p align="center">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.</p>
+ <p align="center"><b>Define macro BOOST_FILESYSTEM_VERSION as 3 to use Version 3. You may do this via a
+ compiler argument or via <code>#define BOOST_FILESYSTEM_VERSION 3</code>.
+ This will be the default for release 1.46 and later.</b></p>
+ <p align="center"><b>Define macro BOOST_FILESYSTEM_VERSION as 2 to use Version
+ 2. You may do this via a
+ compiler argument or via <code>#define BOOST_FILESYSTEM_VERSION 2</code>.
+ This is the default for release 1.44 and 1.45.</b></p>
<p align="center">Existing code should be moved to Version 3 as soon as
convenient. New code should be written for Version 3.</p>
- <p align="center">Version 2 is deprecated, and will be removed from Boost
- releases at the end of a transition period.</p>
+ <p align="center">Version 2 is deprecated, and will not be included in Boost
+ releases 1.48 and later.</p>
</td>
</tr>
</table>
@@ -460,7 +466,7 @@
<hr>
<p>Revised
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->11 June, 2010<!--webbot bot="Timestamp" endspan i-checksum="19839" --></p>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->03 December, 2010<!--webbot bot="Timestamp" endspan i-checksum="38634" --></p>
<p>© Copyright Beman Dawes, 2002-2005</p>
<p> Use, modification, and distribution are subject to the Boost Software