Subject: [Boost-commit] svn:boost r72786 - in branches/release: boost boost/filesystem libs/filesystem libs/filesystem/v3/doc libs/filesystem/v3/example libs/filesystem/v3/src libs/filesystem/v3/test libs/filesystem/v3/test/msvc10 libs/filesystem/v3/test/msvc10/file_status
From: bdawes_at_[hidden]
Date: 2011-06-28 15:24:10
Author: bemandawes
Date: 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
New Revision: 72786
URL: http://svn.boost.org/trac/boost/changeset/72786
Log:
Merge changesets 72278, 72306, 72309, 72521. Authorized by Daniel (1st 3), Eric (last 1).
Added:
branches/release/libs/filesystem/v3/example/file_status.cpp
- copied unchanged from r72782, /trunk/libs/filesystem/v3/example/file_status.cpp
branches/release/libs/filesystem/v3/test/msvc10/file_status/
- copied from r72782, /trunk/libs/filesystem/v3/test/msvc10/file_status/
branches/release/libs/filesystem/v3/test/msvc10/file_status/file_status.vcxproj
- copied unchanged from r72782, /trunk/libs/filesystem/v3/test/msvc10/file_status/file_status.vcxproj
Properties modified:
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/libs/filesystem/ (props changed)
Text files modified:
branches/release/libs/filesystem/v3/doc/release_history.html | 12 +++++++
branches/release/libs/filesystem/v3/example/Jamfile.v2 | 5 ++
branches/release/libs/filesystem/v3/src/operations.cpp | 60 ++++++++++++++++++---------------------
branches/release/libs/filesystem/v3/src/utf8_codecvt_facet.cpp | 4 ++
branches/release/libs/filesystem/v3/test/Jamfile.v2 | 1
branches/release/libs/filesystem/v3/test/msvc10/filesystem-v3.sln | 10 ++++++
6 files changed, 58 insertions(+), 34 deletions(-)
Modified: branches/release/libs/filesystem/v3/doc/release_history.html
==============================================================================
--- branches/release/libs/filesystem/v3/doc/release_history.html (original)
+++ branches/release/libs/filesystem/v3/doc/release_history.html 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -36,6 +36,16 @@
</tr>
</table>
+<h2>1.47.0</h2>
+<ul>
+ <li>Program file_status.cpp added (V3). See boost-root/libs/filesystem/v3/example.
+ Useful both as an example and to explore how Boost.Filesystem treats various
+ status errors. Run "bjam" (NOT "bjam install") in the example directory
+ to install in example/bin.</li>
+</ul>
+
+<h2>1.46.1</h2>
+
<h2>1.46.0</h2>
<ul>
<li>Version 3 of the library is now the default.</li>
@@ -58,7 +68,7 @@
</ul>
<hr>
<p>Revised
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->20 February, 2011<!--webbot bot="Timestamp" endspan i-checksum="40524" --></p>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->31 May, 2011<!--webbot bot="Timestamp" endspan i-checksum="13963" --></p>
<p>© Copyright Beman Dawes, 2011</p>
<p> Use, modification, and distribution are subject to the Boost Software
License, Version 1.0. See <a href="http://www.boost.org/LICENSE_1_0.txt">
Modified: branches/release/libs/filesystem/v3/example/Jamfile.v2
==============================================================================
--- branches/release/libs/filesystem/v3/example/Jamfile.v2 (original)
+++ branches/release/libs/filesystem/v3/example/Jamfile.v2 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -21,4 +21,7 @@
exe tut3 : tut3.cpp ;
exe tut4 : tut4.cpp ;
exe tut5 : tut5.cpp ;
-exe path_info : path_info.cpp ;
+exe path_info : path_info.cpp ;
+exe file_status : file_status.cpp ;
+
+install bin : file_status ; #invoke via "bjam", not "bjam install"
Modified: branches/release/libs/filesystem/v3/src/operations.cpp
==============================================================================
--- branches/release/libs/filesystem/v3/src/operations.cpp (original)
+++ branches/release/libs/filesystem/v3/src/operations.cpp 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -10,6 +10,25 @@
//--------------------------------------------------------------------------------------//
+// define 64-bit offset macros BEFORE including boost/config.hpp (see ticket #5355)
+#if !(defined(__HP_aCC) && defined(_ILP32) && !defined(_STATVFS_ACPP_PROBLEMS_FIXED))
+#define _FILE_OFFSET_BITS 64 // at worst, these defines may have no effect,
+#endif
+#if !defined(__PGI)
+#define __USE_FILE_OFFSET64 // but that is harmless on Windows and on POSIX
+ // 64-bit systems or on 32-bit systems which don't have files larger
+ // than can be represented by a traditional POSIX/UNIX off_t type.
+ // OTOH, defining them should kick in 64-bit off_t's (and thus
+ // st_size)on 32-bit systems that provide the Large File
+ // Support (LFS)interface, such as Linux, Solaris, and IRIX.
+ // The defines are given before any headers are included to
+ // ensure that they are available to all included headers.
+ // That is required at least on Solaris, and possibly on other
+ // systems as well.
+#else
+#define _FILE_OFFSET_BITS 64
+#endif
+
#include <boost/config.hpp>
#if !defined( BOOST_NO_STD_WSTRING )
// Boost.Filesystem V3 and later requires std::wstring support.
@@ -30,30 +49,18 @@
# define _POSIX_PTHREAD_SEMANTICS // Sun readdir_r()needs this
#endif
-#if !defined(__QNXNTO__) && !(defined(__HP_aCC) && defined(_ILP32) && \
- !defined(_STATVFS_ACPP_PROBLEMS_FIXED))
-#define _FILE_OFFSET_BITS 64 // at worst, these defines may have no effect,
-#endif
-#if !defined(__PGI)
-#define __USE_FILE_OFFSET64 // but that is harmless on Windows and on POSIX
- // 64-bit systems or on 32-bit systems which don't have files larger
- // than can be represented by a traditional POSIX/UNIX off_t type.
- // OTOH, defining them should kick in 64-bit off_t's (and thus
- // st_size)on 32-bit systems that provide the Large File
- // Support (LFS)interface, such as Linux, Solaris, and IRIX.
- // The defines are given before any headers are included to
- // ensure that they are available to all included headers.
- // That is required at least on Solaris, and possibly on other
- // systems as well.
-#else
-#define _FILE_OFFSET_BITS 64
-#endif
-
#include <boost/filesystem/v3/operations.hpp>
#include <boost/scoped_array.hpp>
#include <boost/detail/workaround.hpp>
-#include <cstdlib> // for malloc, free
-#include <vector>
+#include <vector>
+#include <cstdlib> // for malloc, free
+#include <sys/stat.h> // even on Windows some functions use stat()
+#include <cstring>
+#include <cstdio> // for remove, rename
+#if defined(__QNXNTO__) // see ticket #5355
+# include <stdio.h>
+#endif
+#include <cerrno>
#ifdef BOOST_FILEYSTEM_INCLUDE_IOSTREAM
# include <iostream>
@@ -178,17 +185,6 @@
# define BOOST_FILESYSTEM_STATUS_CACHE
# endif
-#include <sys/stat.h> // even on Windows some functions use stat()
-#include <string>
-#include <cstring>
-#include <cstdio> // for remove, rename
-#if defined(__QNXNTO__) // see ticket #5355
-# include <stdio.h>
-#endif
-#include <cerrno>
-#include <cassert>
-// #include <iostream> // for debugging only; comment out when not in use
-
// POSIX/Windows macros ----------------------------------------------------//
// Portions of the POSIX and Windows API's are very similar, except for name,
Modified: branches/release/libs/filesystem/v3/src/utf8_codecvt_facet.cpp
==============================================================================
--- branches/release/libs/filesystem/v3/src/utf8_codecvt_facet.cpp (original)
+++ branches/release/libs/filesystem/v3/src/utf8_codecvt_facet.cpp 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -3,6 +3,10 @@
// (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)
+// For HP-UX, request that WCHAR_MAX and WCHAR_MIN be defined as macros,
+// not casts. See ticket 5048
+#define _INCLUDE_STDCSOURCE_199901
+
#ifndef BOOST_SYSTEM_NO_DEPRECATED
# define BOOST_SYSTEM_NO_DEPRECATED
#endif
Modified: branches/release/libs/filesystem/v3/test/Jamfile.v2
==============================================================================
--- branches/release/libs/filesystem/v3/test/Jamfile.v2 (original)
+++ branches/release/libs/filesystem/v3/test/Jamfile.v2 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -28,6 +28,7 @@
[ run large_file_support_test.cpp ]
[ run deprecated_test.cpp ]
[ run ../example/simple_ls.cpp ]
+ [ run ../example/file_status.cpp ]
# [ compile ../example/mbcopy.cpp ]
# [ compile ../example/mbpath.cpp ]
Modified: branches/release/libs/filesystem/v3/test/msvc10/filesystem-v3.sln
==============================================================================
--- branches/release/libs/filesystem/v3/test/msvc10/filesystem-v3.sln (original)
+++ branches/release/libs/filesystem/v3/test/msvc10/filesystem-v3.sln 2011-06-28 15:24:09 EDT (Tue, 28 Jun 2011)
@@ -71,6 +71,12 @@
{FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "file_status", "file_status\file_status.vcxproj", "{43C4B4D8-0893-4C86-B9FD-6A7DEB1A4426}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -158,6 +164,10 @@
{1A6A7DAF-8705-4B2B-83B5-93F84A63496C}.Debug|Win32.Build.0 = Debug|Win32
{1A6A7DAF-8705-4B2B-83B5-93F84A63496C}.Release|Win32.ActiveCfg = Release|Win32
{1A6A7DAF-8705-4B2B-83B5-93F84A63496C}.Release|Win32.Build.0 = Release|Win32
+ {43C4B4D8-0893-4C86-B9FD-6A7DEB1A4426}.Debug|Win32.ActiveCfg = Debug|Win32
+ {43C4B4D8-0893-4C86-B9FD-6A7DEB1A4426}.Debug|Win32.Build.0 = Debug|Win32
+ {43C4B4D8-0893-4C86-B9FD-6A7DEB1A4426}.Release|Win32.ActiveCfg = Release|Win32
+ {43C4B4D8-0893-4C86-B9FD-6A7DEB1A4426}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE