|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62759 - in branches/filesystem3: boost/filesystem boost/filesystem/detail boost/filesystem/v2 libs/filesystem/build libs/filesystem/test libs/filesystem/v2/src libs/filesystem/v2/test libs/filesystem/v3/src libs/filesystem/v3/test
From: bdawes_at_[hidden]
Date: 2010-06-10 16:02:41
Author: bemandawes
Date: 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
New Revision: 62759
URL: http://svn.boost.org/trac/boost/changeset/62759
Log:
V2 tests added. All tests passing on at least one compiler, none passing on all compilers
Added:
branches/filesystem3/boost/filesystem/detail/
branches/filesystem3/boost/filesystem/detail/utf8_codecvt_facet.hpp
- copied, changed from r62704, /branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp
Removed:
branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.cpp
branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.hpp
branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp
Text files modified:
branches/filesystem3/boost/filesystem/config.hpp | 2 +-
branches/filesystem3/boost/filesystem/convenience.hpp | 2 +-
branches/filesystem3/boost/filesystem/detail/utf8_codecvt_facet.hpp | 21 ++++-----------------
branches/filesystem3/boost/filesystem/exception.hpp | 2 +-
branches/filesystem3/boost/filesystem/operations.hpp | 2 +-
branches/filesystem3/boost/filesystem/v2/convenience.hpp | 33 +++++++++++++++++++++++++++++----
branches/filesystem3/boost/filesystem/v2/fstream.hpp | 28 +++++++++++++++++++++++++++-
branches/filesystem3/boost/filesystem/v2/operations.hpp | 14 ++++++++++++++
branches/filesystem3/libs/filesystem/build/Jamfile.v2 | 5 +++--
branches/filesystem3/libs/filesystem/test/Jamfile.v2 | 6 ++++++
branches/filesystem3/libs/filesystem/v2/test/fstream_test.cpp | 2 +-
branches/filesystem3/libs/filesystem/v2/test/lpath.hpp | 4 ++--
branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.cpp | 4 ++--
branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp | 2 +-
branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp | 2 +-
15 files changed, 94 insertions(+), 35 deletions(-)
Modified: branches/filesystem3/boost/filesystem/config.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/config.hpp (original)
+++ branches/filesystem3/boost/filesystem/config.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -29,4 +29,4 @@
# endif
-#endif BOOST_FILESYSTEM_CONFIGX_HPP
+#endif // BOOST_FILESYSTEM_CONFIGX_HPP
Modified: branches/filesystem3/boost/filesystem/convenience.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/convenience.hpp (original)
+++ branches/filesystem3/boost/filesystem/convenience.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -29,4 +29,4 @@
# endif
-#endif BOOST_FILESYSTEM_CONVENIENCEX_HPP
+#endif // BOOST_FILESYSTEM_CONVENIENCEX_HPP
Copied: branches/filesystem3/boost/filesystem/detail/utf8_codecvt_facet.hpp (from r62704, /branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp)
==============================================================================
--- /branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp (original)
+++ branches/filesystem3/boost/filesystem/detail/utf8_codecvt_facet.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -4,13 +4,13 @@
// Distributed under the Boost Software License, Version 1.0.
// (See http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_FILESYSTEM3_UTF8_CODECVT_FACET_HPP
-#define BOOST_FILESYSTEM3_UTF8_CODECVT_FACET_HPP
+#ifndef BOOST_FILESYSTEM_UTF8_CODECVT_FACET_HPP
+#define BOOST_FILESYSTEM_UTF8_CODECVT_FACET_HPP
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
#define BOOST_UTF8_BEGIN_NAMESPACE \
- namespace boost { namespace filesystem3 { namespace detail {
+ namespace boost { namespace filesystem { namespace detail {
#define BOOST_UTF8_END_NAMESPACE }}}
#define BOOST_UTF8_DECL BOOST_FILESYSTEM_DECL
@@ -21,17 +21,4 @@
#undef BOOST_UTF8_END_NAMESPACE
#undef BOOST_UTF8_DECL
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- namespace detail
- {
- using filesystem3::detail::utf8_codecvt_facet;
- }
- }
-}
-
#endif
Modified: branches/filesystem3/boost/filesystem/exception.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/exception.hpp (original)
+++ branches/filesystem3/boost/filesystem/exception.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -29,4 +29,4 @@
# endif
-#endif BOOST_FILESYSTEM_EXCEPTIONX_HPP
+#endif // BOOST_FILESYSTEM_EXCEPTIONX_HPP
Modified: branches/filesystem3/boost/filesystem/operations.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/operations.hpp (original)
+++ branches/filesystem3/boost/filesystem/operations.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -29,4 +29,4 @@
# endif
-#endif BOOST_FILESYSTEM_OPERATIONSX_HPP
+#endif // BOOST_FILESYSTEM_OPERATIONSX_HPP
Modified: branches/filesystem3/boost/filesystem/v2/convenience.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v2/convenience.hpp (original)
+++ branches/filesystem3/boost/filesystem/v2/convenience.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -56,7 +56,7 @@
return true;
}
-# ifndef BOOST_FILESYSTEM2_NO_DEPRECATED
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
BOOST_FS_FUNC_STRING extension(const Path& ph)
{
@@ -85,7 +85,7 @@
# endif
-# ifndef BOOST_FILESYSTEM2_NARROW_ONLY
+# ifndef BOOST_FILESYSTEM_NARROW_ONLY
// "do-the-right-thing" overloads ---------------------------------------//
@@ -94,7 +94,7 @@
inline bool create_directories(const wpath& ph)
{ return create_directories<wpath>(ph); }
-# ifndef BOOST_FILESYSTEM2_NO_DEPRECATED
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
inline std::string extension(const path& ph)
{ return extension<path>(ph); }
inline std::wstring extension(const wpath& ph)
@@ -199,7 +199,7 @@
};
typedef basic_recursive_directory_iterator<path> recursive_directory_iterator;
-# ifndef BOOST_FILESYSTEM2_NARROW_ONLY
+# ifndef BOOST_FILESYSTEM_NARROW_ONLY
typedef basic_recursive_directory_iterator<wpath> wrecursive_directory_iterator;
# endif
@@ -302,5 +302,30 @@
#undef BOOST_FS_FUNC_STRING
#undef BOOST_FS_FUNC
+//----------------------------------------------------------------------------//
+
+namespace boost
+{
+ namespace filesystem
+ {
+ using filesystem2::create_directories;
+ using filesystem2::basic_recursive_directory_iterator;
+ using filesystem2::recursive_directory_iterator;
+
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+ using filesystem2::extension;
+ using filesystem2::basename;
+ using filesystem2::change_extension;
+# endif
+
+# ifndef BOOST_FILESYSTEM_NARROW_ONLY
+ using filesystem2::wrecursive_directory_iterator;
+# endif
+
+ }
+}
+
+//----------------------------------------------------------------------------//
+
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM2_CONVENIENCE_HPP
Modified: branches/filesystem3/boost/filesystem/v2/fstream.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v2/fstream.hpp (original)
+++ branches/filesystem3/boost/filesystem/v2/fstream.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -12,7 +12,7 @@
#ifndef BOOST_FILESYSTEM2_FSTREAM_HPP
#define BOOST_FILESYSTEM2_FSTREAM_HPP
-#include <boost/filesystem/operations.hpp> // for 8.3 hack (see below)
+#include <boost/filesystem/v2/operations.hpp> // for 8.3 hack (see below)
#include <boost/utility/enable_if.hpp>
#include <boost/detail/workaround.hpp>
@@ -580,5 +580,31 @@
} // namespace filesystem2
} // namespace boost
+//----------------------------------------------------------------------------//
+
+namespace boost
+{
+ namespace filesystem
+ {
+ using filesystem2::filebuf;
+ using filesystem2::ifstream;
+ using filesystem2::ofstream;
+ using filesystem2::fstream;
+ using filesystem2::wfilebuf;
+ using filesystem2::wifstream;
+ using filesystem2::wfstream;
+ using filesystem2::wofstream;
+ using filesystem2::basic_filebuf;
+ using filesystem2::basic_ifstream;
+ using filesystem2::basic_ofstream;
+ using filesystem2::basic_fstream;
+
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# endif
+ }
+}
+
+//----------------------------------------------------------------------------//
+
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM2_FSTREAM_HPP
Modified: branches/filesystem3/boost/filesystem/v2/operations.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v2/operations.hpp (original)
+++ branches/filesystem3/boost/filesystem/v2/operations.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -1182,6 +1182,8 @@
{
using filesystem2::basic_directory_entry;
using filesystem2::basic_directory_iterator;
+ using filesystem2::block_file;
+ using filesystem2::character_file;
using filesystem2::complete;
using filesystem2::copy_file;
using filesystem2::copy_option;
@@ -1190,9 +1192,12 @@
using filesystem2::create_symlink;
using filesystem2::current_path;
using filesystem2::directory_entry;
+ using filesystem2::directory_file;
using filesystem2::directory_iterator;
using filesystem2::equivalent;
using filesystem2::exists;
+ using filesystem2::fifo_file;
+ using filesystem2::file_not_found;
using filesystem2::file_size;
using filesystem2::file_status;
using filesystem2::file_type;
@@ -1204,15 +1209,19 @@
using filesystem2::is_regular_file;
using filesystem2::is_symlink;
using filesystem2::last_write_time;
+ using filesystem2::regular_file;
using filesystem2::remove;
using filesystem2::remove_all;
using filesystem2::rename;
+ using filesystem2::socket_file;
using filesystem2::space;
using filesystem2::space_info;
using filesystem2::status;
using filesystem2::status_known;
+ using filesystem2::symlink_file;
using filesystem2::symlink_status;
using filesystem2::system_complete;
+ using filesystem2::type_unknown;
# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
using filesystem2::is_regular;
using filesystem2::symbolic_link_exists;
@@ -1221,6 +1230,11 @@
using filesystem2::wdirectory_iterator;
using filesystem2::wdirectory_entry;
# endif
+ namespace detail
+ {
+ using filesystem2::detail::not_found_error;
+ using filesystem2::detail::possible_large_file_size_support;
+ }
}
}
Modified: branches/filesystem3/libs/filesystem/build/Jamfile.v2
==============================================================================
--- branches/filesystem3/libs/filesystem/build/Jamfile.v2 (original)
+++ branches/filesystem3/libs/filesystem/build/Jamfile.v2 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -14,9 +14,10 @@
;
SOURCES =
- v2/src/v2_operations v2/src/v2_path v2/src/v2_portability v2/src/v2_utf8_codecvt_facet
+ v2/src/v2_operations v2/src/v2_path v2/src/v2_portability
v3/src/operations v3/src/path v3/src/portability v3/src/utf8_codecvt_facet
- v3/src/codecvt_error_category v3/src/path_traits v3/src/unique_path v3/src/windows_file_codecvt
+ v3/src/codecvt_error_category v3/src/path_traits v3/src/unique_path
+ v3/src/windows_file_codecvt
;
Modified: branches/filesystem3/libs/filesystem/test/Jamfile.v2
==============================================================================
--- branches/filesystem3/libs/filesystem/test/Jamfile.v2 (original)
+++ branches/filesystem3/libs/filesystem/test/Jamfile.v2 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -12,6 +12,12 @@
;
test-suite "filesystem" :
+ [ run ../v2/test/path_test.cpp : : : : v2_path_test ]
+ [ run ../v2/test/operations_test.cpp : : : : v2_operations_test ]
+ [ run ../v2/test/fstream_test.cpp : : : : v2_fstream_test ]
+ [ run ../v2/test/convenience_test.cpp : : : : v2_convenience_test ]
+ [ run ../v2/test/large_file_support_test.cpp : : : : v2_large_file_support_test ]
+
[ run ../v3/test/path_unit_test.cpp : : : : v3_path_unit_test ]
[ run ../v3/test/path_test.cpp : : : : v3_path_test ]
[ run ../v3/test/operations_unit_test.cpp : : : : v3_operations_unit_test ]
Deleted: branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.cpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
+++ (empty file)
@@ -1,19 +0,0 @@
-// Copyright Vladimir Prus 2004.
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt
-// or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_FILESYSTEM_SOURCE
-#include <boost/filesystem/v2/config.hpp>
-
-#define BOOST_UTF8_BEGIN_NAMESPACE \
- namespace boost { namespace filesystem2 { namespace detail {
-
-#define BOOST_UTF8_END_NAMESPACE }}}
-#define BOOST_UTF8_DECL BOOST_FILESYSTEM_DECL
-
-#include "libs/detail/utf8_codecvt_facet.cpp"
-
- #undef BOOST_UTF8_BEGIN_NAMESPACE
-#undef BOOST_UTF8_END_NAMESPACE
-#undef BOOST_UTF8_DECL
Deleted: branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.hpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v2/src/v2_utf8_codecvt_facet.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
+++ (empty file)
@@ -1,24 +0,0 @@
-// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia_at_[hidden])
-// Andrew Lumsdaine, Indiana University (lums_at_[hidden]).
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_FILESYSTEM_UTF8_CODECVT_FACET_HPP
-#define BOOST_FILESYSTEM_UTF8_CODECVT_FACET_HPP
-
-#include <boost/filesystem/v2/config.hpp>
-
-#define BOOST_UTF8_BEGIN_NAMESPACE \
- namespace boost { namespace filesystem2 { namespace detail {
-
-#define BOOST_UTF8_END_NAMESPACE }}}
-#define BOOST_UTF8_DECL BOOST_FILESYSTEM_DECL
-
-#include <boost/detail/utf8_codecvt_facet.hpp>
-
-#undef BOOST_UTF8_BEGIN_NAMESPACE
-#undef BOOST_UTF8_END_NAMESPACE
-#undef BOOST_UTF8_DECL
-
-#endif
Modified: branches/filesystem3/libs/filesystem/v2/test/fstream_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v2/test/fstream_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v2/test/fstream_test.cpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -18,7 +18,7 @@
#include <iostream>
#include <cstdio> // for std::remove
-#include "../src/utf8_codecvt_facet.hpp"
+#include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
#ifndef BOOST_FILESYSTEM_NARROW_ONLY
# include "lpath.hpp"
Modified: branches/filesystem3/libs/filesystem/v2/test/lpath.hpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v2/test/lpath.hpp (original)
+++ branches/filesystem3/libs/filesystem/v2/test/lpath.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -8,7 +8,7 @@
// See library home page at http://www.boost.org/libs/filesystem
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/v2/path.hpp>
#include <cwchar> // for std::mbstate_t
#include <string>
#include <ios> // for std::streamoff
@@ -93,7 +93,7 @@
namespace boost
{
- namespace filesystem
+ namespace filesystem2
{
template<> struct is_basic_path<user::lpath>
{ static const bool value = true; };
Modified: branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.cpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -4,10 +4,10 @@
// or copy at http://www.boost.org/LICENSE_1_0.txt)
#define BOOST_FILESYSTEM_SOURCE
-#include <boost/filesystem/v3/config.hpp>
+#include <boost/filesystem/config.hpp>
#define BOOST_UTF8_BEGIN_NAMESPACE \
- namespace boost { namespace filesystem3 { namespace detail {
+ namespace boost { namespace filesystem { namespace detail {
#define BOOST_UTF8_END_NAMESPACE }}}
#define BOOST_UTF8_DECL BOOST_FILESYSTEM_DECL
Deleted: branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/src/utf8_codecvt_facet.hpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
+++ (empty file)
@@ -1,37 +0,0 @@
-// Copyright (c) 2001 Ronald Garcia, Indiana University (garcia_at_[hidden])
-// Andrew Lumsdaine, Indiana University (lums_at_[hidden]).
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_FILESYSTEM3_UTF8_CODECVT_FACET_HPP
-#define BOOST_FILESYSTEM3_UTF8_CODECVT_FACET_HPP
-
-#include <boost/filesystem/v3/config.hpp>
-
-#define BOOST_UTF8_BEGIN_NAMESPACE \
- namespace boost { namespace filesystem3 { namespace detail {
-
-#define BOOST_UTF8_END_NAMESPACE }}}
-#define BOOST_UTF8_DECL BOOST_FILESYSTEM_DECL
-
-#include <boost/detail/utf8_codecvt_facet.hpp>
-
-#undef BOOST_UTF8_BEGIN_NAMESPACE
-#undef BOOST_UTF8_END_NAMESPACE
-#undef BOOST_UTF8_DECL
-
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- namespace detail
- {
- using filesystem3::detail::utf8_codecvt_facet;
- }
- }
-}
-
-#endif
Modified: branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -20,7 +20,7 @@
#include <iostream>
#include <cstdio> // for std::remove
-#include "../src/utf8_codecvt_facet.hpp"
+#include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
namespace fs = boost::filesystem;
Modified: branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp 2010-06-10 16:02:39 EDT (Thu, 10 Jun 2010)
@@ -27,7 +27,7 @@
#define BOOST_FILESYSTEM_NO_DEPRECATED
#include <boost/filesystem/path.hpp>
-#include "../src/utf8_codecvt_facet.hpp" // for imbue tests
+#include <boost/filesystem/detail/utf8_codecvt_facet.hpp> // for imbue tests
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
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