Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r63185 - in trunk: boost/filesystem/v2 boost/filesystem/v3 libs/filesystem/v2/src libs/filesystem/v2/test libs/filesystem/v3/src libs/filesystem/v3/test
From: bdawes_at_[hidden]
Date: 2010-06-21 09:13:23

Author: bemandawes
Date: 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
New Revision: 63185
URL: http://svn.boost.org/trac/boost/changeset/63185

Log:
Fix #4248 W.R.T. BOOST_FILESYSTEM_NO_DEPRECATED and BOOST_SYSTEM_NO_DEPRECATED
Text files modified:
   trunk/boost/filesystem/v2/convenience.hpp | 2 +-
   trunk/boost/filesystem/v3/path.hpp | 3 +++
   trunk/libs/filesystem/v2/src/v2_operations.cpp | 6 +++++-
   trunk/libs/filesystem/v2/src/v2_path.cpp | 6 +++++-
   trunk/libs/filesystem/v2/src/v2_portability.cpp | 4 ++++
   trunk/libs/filesystem/v2/test/convenience_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v2/test/fstream_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v2/test/large_file_support_test.cpp | 8 ++++++--
   trunk/libs/filesystem/v2/test/operations_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v2/test/path_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v2/test/wide_test.cpp | 9 +++++++--
   trunk/libs/filesystem/v3/src/codecvt_error_category.cpp | 6 +++++-
   trunk/libs/filesystem/v3/src/operations.cpp | 8 +++++++-
   trunk/libs/filesystem/v3/src/path.cpp | 4 ++++
   trunk/libs/filesystem/v3/src/path_traits.cpp | 4 ++++
   trunk/libs/filesystem/v3/src/portability.cpp | 4 ++++
   trunk/libs/filesystem/v3/src/unique_path.cpp | 4 ++++
   trunk/libs/filesystem/v3/src/utf8_codecvt_facet.cpp | 4 ++++
   trunk/libs/filesystem/v3/src/windows_file_codecvt.cpp | 4 ++++
   trunk/libs/filesystem/v3/test/convenience_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v3/test/fstream_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v3/test/large_file_support_test.cpp | 1 +
   trunk/libs/filesystem/v3/test/operations_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v3/test/operations_unit_test.cpp | 11 ++++++++---
   trunk/libs/filesystem/v3/test/path_test.cpp | 7 ++++++-
   trunk/libs/filesystem/v3/test/path_unit_test.cpp | 7 ++++++-
   26 files changed, 130 insertions(+), 21 deletions(-)

Modified: trunk/boost/filesystem/v2/convenience.hpp
==============================================================================
--- trunk/boost/filesystem/v2/convenience.hpp (original)
+++ trunk/boost/filesystem/v2/convenience.hpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -45,7 +45,7 @@
            if ( !ph.empty() && !is_directory(ph) )
                boost::throw_exception( basic_filesystem_error<Path>(
                  "boost::filesystem::create_directories", ph,
- make_error_code( boost::system::posix::file_exists ) ) );
+ make_error_code( boost::system::errc::file_exists ) ) );
            return false;
          }
 

Modified: trunk/boost/filesystem/v3/path.hpp
==============================================================================
--- trunk/boost/filesystem/v3/path.hpp (original)
+++ trunk/boost/filesystem/v3/path.hpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -566,6 +566,9 @@
   
   // name_checks
 
+ // These functions are holdovers from version 1. It isn't clear they have much
+ // usefulness, or how to generalize them for later versions.
+
   BOOST_FILESYSTEM_DECL bool portable_posix_name(const std::string & name);
   BOOST_FILESYSTEM_DECL bool windows_name(const std::string & name);
   BOOST_FILESYSTEM_DECL bool portable_name(const std::string & name);

Modified: trunk/libs/filesystem/v2/src/v2_operations.cpp
==============================================================================
--- trunk/libs/filesystem/v2/src/v2_operations.cpp (original)
+++ trunk/libs/filesystem/v2/src/v2_operations.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -12,7 +12,11 @@
 
 // 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
+#define BOOST_FILESYSTEM_SOURCE
+
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #define _POSIX_PTHREAD_SEMANTICS // Sun readdir_r() needs this
 

Modified: trunk/libs/filesystem/v2/src/v2_path.cpp
==============================================================================
--- trunk/libs/filesystem/v2/src/v2_path.cpp (original)
+++ trunk/libs/filesystem/v2/src/v2_path.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,6 +13,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v2/config.hpp>
 
 #ifndef BOOST_FILESYSTEM_NARROW_ONLY
@@ -85,7 +89,7 @@
       if ( locked ) boost::throw_exception(
         wfilesystem_error(
           "boost::filesystem::wpath_traits::imbue() after lockdown",
- make_error_code( system::posix::not_supported ) ) );
+ make_error_code( system::errc::not_supported ) ) );
       imbue( new_loc, std::nothrow );
     }
 

Modified: trunk/libs/filesystem/v2/src/v2_portability.cpp
==============================================================================
--- trunk/libs/filesystem/v2/src/v2_portability.cpp (original)
+++ trunk/libs/filesystem/v2/src/v2_portability.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,6 +13,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v2/config.hpp>
 #include <boost/filesystem/v2/path.hpp>
 

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -11,7 +11,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/convenience.hpp>
 namespace fs = boost::filesystem;

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -10,7 +10,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -7,9 +7,13 @@
 
 // See library home page at http://www.boost.org/libs/filesystem
 
-
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/operations.hpp>
 namespace fs = boost::filesystem;

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -10,7 +10,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/convenience.hpp>

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -14,7 +14,12 @@
 // convenience_test.cpp by Vladimir Prus.
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/utility.hpp>

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-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -11,7 +11,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/config.hpp>
 # ifdef BOOST_FILESYSTEM_NARROW_ONLY
@@ -51,7 +56,7 @@
     if ( !f )
       throw fs::basic_filesystem_error<Path>( "wide_test create_file",
         ph,
- boost::system::error_code( errno, boost::system::errno_ecat ) );
+ boost::system::error_code( errno, boost::system::generic_category() ) );
     if ( !contents.empty() ) f << contents;
   }
 

Modified: trunk/libs/filesystem/v3/src/codecvt_error_category.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/codecvt_error_category.cpp (original)
+++ trunk/libs/filesystem/v3/src/codecvt_error_category.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,7 +13,11 @@
 
 // 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
+#define BOOST_FILESYSTEM_SOURCE
+
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/v3/config.hpp>
 #include <boost/filesystem/v3/path_traits.hpp>

Modified: trunk/libs/filesystem/v3/src/operations.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/operations.cpp (original)
+++ trunk/libs/filesystem/v3/src/operations.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -14,7 +14,13 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
-#define _POSIX_PTHREAD_SEMANTICS // Sun readdir_r()needs this
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS // Sun readdir_r()needs this
+#endif
 
 #if !(defined(__HP_aCC) && defined(_ILP32) && \
       !defined(_STATVFS_ACPP_PROBLEMS_FIXED))

Modified: trunk/libs/filesystem/v3/src/path.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/path.cpp (original)
+++ trunk/libs/filesystem/v3/src/path.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -11,6 +11,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v3/config.hpp>
 #include <boost/filesystem/v3/path.hpp>
 #include <boost/scoped_array.hpp>

Modified: trunk/libs/filesystem/v3/src/path_traits.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/path_traits.cpp (original)
+++ trunk/libs/filesystem/v3/src/path_traits.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -11,6 +11,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v3/config.hpp>
 #include <boost/filesystem/v3/path_traits.hpp>
 #include <boost/system/system_error.hpp>

Modified: trunk/libs/filesystem/v3/src/portability.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/portability.cpp (original)
+++ trunk/libs/filesystem/v3/src/portability.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,6 +13,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v3/config.hpp>
 #include <boost/filesystem/v3/path.hpp>
 

Modified: trunk/libs/filesystem/v3/src/unique_path.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/unique_path.cpp (original)
+++ trunk/libs/filesystem/v3/src/unique_path.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,6 +13,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v3/operations.hpp>
 
 # ifdef BOOST_POSIX_API

Modified: trunk/libs/filesystem/v3/src/utf8_codecvt_facet.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/utf8_codecvt_facet.cpp (original)
+++ trunk/libs/filesystem/v3/src/utf8_codecvt_facet.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -3,6 +3,10 @@
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #define BOOST_FILESYSTEM_SOURCE
 #include <boost/filesystem/config.hpp>
 

Modified: trunk/libs/filesystem/v3/src/windows_file_codecvt.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/windows_file_codecvt.cpp (original)
+++ trunk/libs/filesystem/v3/src/windows_file_codecvt.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -11,6 +11,10 @@
 // the library is being built (possibly exporting rather than importing code)
 #define BOOST_FILESYSTEM_SOURCE
 
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
+
 #include <boost/filesystem/v3/config.hpp>
 
 #ifdef BOOST_WINDOWS_API

Modified: trunk/libs/filesystem/v3/test/convenience_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/convenience_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/convenience_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -13,7 +13,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/convenience.hpp>
 namespace fs = boost::filesystem;

Modified: trunk/libs/filesystem/v3/test/fstream_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/fstream_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/fstream_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -12,7 +12,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>

Modified: trunk/libs/filesystem/v3/test/large_file_support_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/large_file_support_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/large_file_support_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -12,6 +12,7 @@
 
 // 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;

Modified: trunk/libs/filesystem/v3/test/operations_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/operations_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/operations_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -12,7 +12,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/cerrno.hpp>

Modified: trunk/libs/filesystem/v3/test/operations_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/operations_unit_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/operations_unit_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -12,12 +12,17 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
-#include <iostream>
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem.hpp> // make sure filesystem.hpp works
 #include <boost/system/error_code.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <iostream>
 
 using namespace boost::filesystem;
 using namespace boost::system;

Modified: trunk/libs/filesystem/v3/test/path_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/path_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/path_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -18,7 +18,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/utility.hpp>

Modified: trunk/libs/filesystem/v3/test/path_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/path_unit_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/path_unit_test.cpp 2010-06-21 09:13:20 EDT (Mon, 21 Jun 2010)
@@ -24,7 +24,12 @@
 #include <boost/config/warning_disable.hpp>
 
 // See deprecated_test for tests of deprecated features
-#define BOOST_FILESYSTEM_NO_DEPRECATED
+#ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# define BOOST_FILESYSTEM_NO_DEPRECATED
+#endif
+#ifndef BOOST_SYSTEM_NO_DEPRECATED
+# define BOOST_SYSTEM_NO_DEPRECATED
+#endif
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/detail/utf8_codecvt_facet.hpp> // for imbue tests

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