Subject: [Boost-commit] svn:boost r67066 - in trunk: boost boost/filesystem libs/filesystem/v3/src
From: bdawes_at_[hidden]
Date: 2010-12-06 08:17:46
Author: bemandawes
Date: 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
New Revision: 67066
URL: http://svn.boost.org/trac/boost/changeset/67066
Log:
Fix #4891, again, clearing problem if BOOST_FILESYSTEM_VERSION defined in <boost/config/user.hpp>
Text files modified:
trunk/boost/filesystem.hpp | 3 +++
trunk/boost/filesystem/config.hpp | 3 +++
trunk/boost/filesystem/convenience.hpp | 3 +++
trunk/boost/filesystem/exception.hpp | 3 +++
trunk/boost/filesystem/fstream.hpp | 3 +++
trunk/boost/filesystem/operations.hpp | 3 +++
trunk/boost/filesystem/path.hpp | 3 +++
trunk/libs/filesystem/v3/src/operations.cpp | 3 ++-
8 files changed, 23 insertions(+), 1 deletions(-)
Modified: trunk/boost/filesystem.hpp
==============================================================================
--- trunk/boost/filesystem.hpp (original)
+++ trunk/boost/filesystem.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_FILESYSTEM_HPP
#define BOOST_FILESYSTEM_FILESYSTEM_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/config.hpp
==============================================================================
--- trunk/boost/filesystem/config.hpp (original)
+++ trunk/boost/filesystem/config.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_CONFIGX_HPP
#define BOOST_FILESYSTEM_CONFIGX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/convenience.hpp
==============================================================================
--- trunk/boost/filesystem/convenience.hpp (original)
+++ trunk/boost/filesystem/convenience.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_CONVENIENCEX_HPP
#define BOOST_FILESYSTEM_CONVENIENCEX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/exception.hpp
==============================================================================
--- trunk/boost/filesystem/exception.hpp (original)
+++ trunk/boost/filesystem/exception.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_EXCEPTIONX_HPP
#define BOOST_FILESYSTEM_EXCEPTIONX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/fstream.hpp
==============================================================================
--- trunk/boost/filesystem/fstream.hpp (original)
+++ trunk/boost/filesystem/fstream.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_FSTREAMX_HPP
#define BOOST_FILESYSTEM_FSTREAMX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/operations.hpp
==============================================================================
--- trunk/boost/filesystem/operations.hpp (original)
+++ trunk/boost/filesystem/operations.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_OPERATIONSX_HPP
#define BOOST_FILESYSTEM_OPERATIONSX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp (original)
+++ trunk/boost/filesystem/path.hpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -12,6 +12,9 @@
#ifndef BOOST_FILESYSTEM_PATHX_HPP
#define BOOST_FILESYSTEM_PATHX_HPP
+#include <boost/config.hpp> // for <boost/config/user.hpp>, in case
+ // BOOST_FILESYSTEM_VERSION defined there
+
# if defined(BOOST_FILESYSTEM_VERSION) \
&& BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
Modified: trunk/libs/filesystem/v3/src/operations.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/operations.cpp (original)
+++ trunk/libs/filesystem/v3/src/operations.cpp 2010-12-06 08:17:45 EST (Mon, 06 Dec 2010)
@@ -428,7 +428,8 @@
{ return false; }
int oflag = O_CREAT | O_WRONLY;
- if (fail_if_exists)oflag |= O_EXCL;
+ if (fail_if_exists)
+ oflag |= O_EXCL;
if ((outfile = ::open(to_p.c_str(), oflag, from_stat.st_mode))< 0)
{
int open_errno = errno;