Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r52536 - branches/release/boost/filesystem
From: bdawes_at_[hidden]
Date: 2009-04-22 09:16:54


Author: bemandawes
Date: 2009-04-22 09:16:52 EDT (Wed, 22 Apr 2009)
New Revision: 52536
URL: http://svn.boost.org/trac/boost/changeset/52536

Log:
Merge ticket 2948 fixes from trunk
Text files modified:
   branches/release/boost/filesystem/operations.hpp | 14 ++++++++------
   1 files changed, 8 insertions(+), 6 deletions(-)

Modified: branches/release/boost/filesystem/operations.hpp
==============================================================================
--- branches/release/boost/filesystem/operations.hpp (original)
+++ branches/release/boost/filesystem/operations.hpp 2009-04-22 09:16:52 EDT (Wed, 22 Apr 2009)
@@ -40,6 +40,14 @@
     namespace std { using ::time_t; }
 # endif
 
+//----------------------------------------------------------------------------//
+
+namespace boost
+{
+ namespace filesystem
+ {
+
+// typedef boost::filesystem::path Path; needs to be in namespace boost::filesystem
 # ifndef BOOST_FILESYSTEM_NARROW_ONLY
 # define BOOST_FS_FUNC(BOOST_FS_TYPE) \
       template<class Path> typename boost::enable_if<is_basic_path<Path>, \
@@ -55,12 +63,6 @@
 # define BOOST_FS_TYPENAME
 # endif
 
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
     template<class Path> class basic_directory_iterator;
 
     // BOOST_FILESYSTEM_NARROW_ONLY needs this:


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