Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r66996 - in trunk: boost/filesystem/v2 libs/filesystem/v2/doc libs/filesystem/v3/doc
From: bdawes_at_[hidden]
Date: 2010-12-03 19:39:21

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r66997 - trunk/boost/spirit/home/support/utree/detail"
Previous message: joel_at_[hidden]: "[Boost-commit] svn:boost r66995 - trunk/libs/spirit/test/qi"

Author: bemandawes
Date: 2010-12-03 19:39:20 EST (Fri, 03 Dec 2010)
New Revision: 66996
URL: http://svn.boost.org/trac/boost/changeset/66996

Log:
Verify, clarify, document, that <boost/config/user.hpp> can be used to specify BOOST_FILESYSTEM_VERSION. Fixes #4891.
Text files modified:
 trunk/boost/filesystem/v2/convenience.hpp | 3 ++-
 trunk/boost/filesystem/v2/fstream.hpp | 1 +
 trunk/boost/filesystem/v2/operations.hpp | 1 +
 trunk/libs/filesystem/v2/doc/index.htm | 36 ++++++++++++++++++++++++------------
 trunk/libs/filesystem/v3/doc/index.htm | 34 +++++++++++++++++++++++-----------
 5 files changed, 51 insertions(+), 24 deletions(-)

Modified: trunk/boost/filesystem/v2/convenience.hpp
==============================================================================
--- trunk/boost/filesystem/v2/convenience.hpp (original)
+++ trunk/boost/filesystem/v2/convenience.hpp 2010-12-03 19:39:20 EST (Fri, 03 Dec 2010)
@@ -13,7 +13,8 @@
#ifndef BOOST_FILESYSTEM2_CONVENIENCE_HPP
#define BOOST_FILESYSTEM2_CONVENIENCE_HPP

-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/v2/config.hpp>
+#include <boost/filesystem/v2/operations.hpp>
#include <boost/system/error_code.hpp>
#include <vector>
#include <stack>

Modified: trunk/boost/filesystem/v2/fstream.hpp
==============================================================================
--- trunk/boost/filesystem/v2/fstream.hpp (original)
+++ trunk/boost/filesystem/v2/fstream.hpp 2010-12-03 19:39:20 EST (Fri, 03 Dec 2010)
@@ -12,6 +12,7 @@
#ifndef BOOST_FILESYSTEM2_FSTREAM_HPP
#define BOOST_FILESYSTEM2_FSTREAM_HPP

+#include <boost/filesystem/v2/config.hpp>
#include <boost/filesystem/v2/operations.hpp> // for 8.3 hack (see below)
#include <boost/utility/enable_if.hpp>
#include <boost/detail/workaround.hpp>

Modified: trunk/boost/filesystem/v2/operations.hpp
==============================================================================
--- trunk/boost/filesystem/v2/operations.hpp (original)
+++ trunk/boost/filesystem/v2/operations.hpp 2010-12-03 19:39:20 EST (Fri, 03 Dec 2010)
@@ -14,6 +14,7 @@
#ifndef BOOST_FILESYSTEM2_OPERATIONS_HPP
#define BOOST_FILESYSTEM2_OPERATIONS_HPP

+#include <boost/filesystem/v2/config.hpp>
#include <boost/filesystem/v2/path.hpp>
#include <boost/detail/scoped_enum_emulation.hpp>

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 19:39:20 EST (Fri, 03 Dec 2010)
@@ -72,23 +72,35 @@
 <table border="1" cellpadding="10" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111">
 <tr>
 <td>
- This is Version 2 of the Filesystem library.
- Version 3, a major revision with many new and improved
+ This is the home page for Version 2 of the Filesystem library.
+ Version 3, a major revision with many new and improved
 features, is also available. Version 3 may break some user code written
 for Version 2.
- To ease the transition, Boost releases 1.44 through 1.47
+ 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. 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.
- 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.
- Existing code should be moved to version 3 as soon as
+ 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
+ Version 2 is deprecated, and will not be included in Boost
 releases 1.48 and later.
 </td>
 </tr>

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 19:39:20 EST (Fri, 03 Dec 2010)
@@ -67,22 +67,34 @@
 <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
+ 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
+ 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. 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.
- 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.
- Existing code should be moved to Version 3 as soon as
+ 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
+ Version 2 is deprecated, and will not be included in Boost
 releases 1.48 and later.
 </td>
 </tr>

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r66997 - trunk/boost/spirit/home/support/utree/detail"
Previous message: joel_at_[hidden]: "[Boost-commit] svn:boost r66995 - trunk/libs/spirit/test/qi"

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