Subject: [Boost-commit] svn:boost r77453 - in branches/filesystem-v3: boost/filesystem libs/filesystem/src
From: bdawes_at_[hidden]
Date: 2012-03-21 09:24:33
Author: bemandawes
Date: 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
New Revision: 77453
URL: http://svn.boost.org/trac/boost/changeset/77453
Log:
Remove namespace filesystem3 hoisting into namespace filesystem
Text files modified:
branches/filesystem-v3/boost/filesystem/convenience.hpp | 20 ------
branches/filesystem-v3/boost/filesystem/fstream.hpp | 30 ----------
branches/filesystem-v3/boost/filesystem/operations.hpp | 107 ---------------------------------------
branches/filesystem-v3/boost/filesystem/path.hpp | 36 +------------
branches/filesystem-v3/boost/filesystem/path_traits.hpp | 14 ----
branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp | 4
branches/filesystem-v3/libs/filesystem/src/operations.cpp | 18 +++---
branches/filesystem-v3/libs/filesystem/src/path.cpp | 16 ++--
branches/filesystem-v3/libs/filesystem/src/path_traits.cpp | 8 +-
branches/filesystem-v3/libs/filesystem/src/portability.cpp | 6 +-
branches/filesystem-v3/libs/filesystem/src/unique_path.cpp | 2
11 files changed, 37 insertions(+), 224 deletions(-)
Modified: branches/filesystem-v3/boost/filesystem/convenience.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/convenience.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/convenience.hpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -26,7 +26,7 @@
namespace boost
{
- namespace filesystem3
+ namespace filesystem
{
# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
@@ -51,24 +51,8 @@
# endif
- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::extension;
- using filesystem3::basename;
- using filesystem3::change_extension;
-# endif
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_CONVENIENCE_HPP
Modified: branches/filesystem-v3/boost/filesystem/fstream.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/fstream.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/fstream.hpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -36,7 +36,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
//--------------------------------------------------------------------------------------//
@@ -175,34 +175,8 @@
typedef basic_ofstream<wchar_t> wofstream;
typedef basic_fstream<wchar_t> wfstream;
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::filebuf;
- using filesystem3::ifstream;
- using filesystem3::ofstream;
- using filesystem3::fstream;
- using filesystem3::wfilebuf;
- using filesystem3::wifstream;
- using filesystem3::wfstream;
- using filesystem3::wofstream;
- using filesystem3::basic_filebuf;
- using filesystem3::basic_ifstream;
- using filesystem3::basic_ofstream;
- using filesystem3::basic_fstream;
-
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-# endif
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_FSTREAM_HPP
Modified: branches/filesystem-v3/boost/filesystem/operations.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/operations.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/operations.hpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -51,7 +51,7 @@
namespace boost
{
- namespace filesystem3
+ namespace filesystem
{
//--------------------------------------------------------------------------------------//
@@ -1089,111 +1089,8 @@
BOOST_FILESYSTEM_DECL bool possible_large_file_size_support();
}
- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- // permissions
- using filesystem3::no_perms;
- using filesystem3::owner_read;
- using filesystem3::owner_write;
- using filesystem3::owner_exe;
- using filesystem3::owner_all;
- using filesystem3::group_read;
- using filesystem3::group_write;
- using filesystem3::group_exe;
- using filesystem3::group_all;
- using filesystem3::others_read;
- using filesystem3::others_write;
- using filesystem3::others_exe;
- using filesystem3::others_all;
- using filesystem3::all_all;
- using filesystem3::set_uid_on_exe;
- using filesystem3::set_gid_on_exe;
- using filesystem3::sticky_bit;
- using filesystem3::perms_mask;
- using filesystem3::perms_not_known;
- using filesystem3::add_perms;
- using filesystem3::remove_perms;
- using filesystem3::symlink_perms;
-
- using filesystem3::absolute;
- using filesystem3::block_file;
- using filesystem3::canonical;
- using filesystem3::character_file;
-// using filesystem3::copy;
- using filesystem3::copy_file;
- using filesystem3::copy_option;
- using filesystem3::copy_symlink;
- using filesystem3::create_directories;
- using filesystem3::create_directory;
- using filesystem3::create_hard_link;
- using filesystem3::create_symlink;
- using filesystem3::create_directory_symlink;
- using filesystem3::current_path;
- using filesystem3::directory_entry;
- using filesystem3::directory_file;
- using filesystem3::directory_iterator;
- using filesystem3::equivalent;
- using filesystem3::exists;
- using filesystem3::fifo_file;
- using filesystem3::file_not_found;
- using filesystem3::file_size;
- using filesystem3::file_status;
- using filesystem3::file_type;
- using filesystem3::filesystem_error;
- using filesystem3::hard_link_count;
- using filesystem3::initial_path;
- using filesystem3::is_directory;
- using filesystem3::is_directory;
- using filesystem3::is_empty;
- using filesystem3::is_other;
- using filesystem3::is_regular_file;
- using filesystem3::is_symlink;
- using filesystem3::last_write_time;
- using filesystem3::permissions;
- using filesystem3::permissions_present;
- using filesystem3::perms;
- using filesystem3::read_symlink;
- using filesystem3::recursive_directory_iterator;
- using filesystem3::regular_file;
- using filesystem3::reparse_file;
- using filesystem3::remove;
- using filesystem3::remove_all;
- using filesystem3::rename;
- using filesystem3::resize_file;
- using filesystem3::socket_file;
- using filesystem3::space;
- using filesystem3::space_info;
- using filesystem3::status;
- using filesystem3::status_error;
- using filesystem3::status_known;
- using filesystem3::symlink_file;
- using filesystem3::symlink_option;
- using filesystem3::symlink_status;
- using filesystem3::system_complete;
- using filesystem3::temp_directory_path;
- using filesystem3::type_present;
- using filesystem3::type_unknown;
- using filesystem3::unique_path;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::is_regular;
- using filesystem3::status_unknown;
- using filesystem3::symbolic_link_exists;
- //using filesystem3::wdirectory_iterator;
- //using filesystem3::wdirectory_entry;
-# endif
- namespace detail
- {
- using filesystem3::detail::possible_large_file_size_support;
- }
- }
-}
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM3_OPERATIONS_HPP
Modified: branches/filesystem-v3/boost/filesystem/path.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/path.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/path.hpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -43,7 +43,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
//------------------------------------------------------------------------------------//
// //
@@ -516,7 +516,7 @@
{
private:
friend class boost::iterator_core_access;
- friend class boost::filesystem3::path;
+ friend class boost::filesystem::path;
friend void m_path_iterator_increment(path::iterator & it);
friend void m_path_iterator_decrement(path::iterator & it);
@@ -718,41 +718,11 @@
{ return generic_wstring(cvt); }
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
//----------------------------------------------------------------------------//
-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::path;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
- using filesystem3::wpath;
-# endif
- using filesystem3::lexicographical_compare;
- using filesystem3::portable_posix_name;
- using filesystem3::windows_name;
- using filesystem3::portable_name;
- using filesystem3::portable_directory_name;
- using filesystem3::portable_file_name;
- using filesystem3::native;
- using filesystem3::swap;
- using filesystem3::operator<;
- using filesystem3::operator==;
- using filesystem3::operator!=;
- using filesystem3::operator>;
- using filesystem3::operator<=;
- using filesystem3::operator>=;
- using filesystem3::operator/;
- using filesystem3::operator<<;
- using filesystem3::operator>>;
- }
-}
-
-//----------------------------------------------------------------------------//
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM_PATH_HPP
Modified: branches/filesystem-v3/boost/filesystem/path_traits.hpp
==============================================================================
--- branches/filesystem-v3/boost/filesystem/path_traits.hpp (original)
+++ branches/filesystem-v3/boost/filesystem/path_traits.hpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -32,7 +32,7 @@
#include <boost/config/abi_prefix.hpp> // must be the last #include
-namespace boost { namespace filesystem3 {
+namespace boost { namespace filesystem {
BOOST_FILESYSTEM_DECL const system::error_category& codecvt_error_category();
// uses std::codecvt_base::result used for error codes:
@@ -230,18 +230,6 @@
}}} // namespace boost::filesystem::path_traits
-//----------------------------------------------------------------------------//
-
-namespace boost
-{
- namespace filesystem
- {
- using filesystem3::codecvt_error_category;
-# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-# endif
- }
-}
-
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM_PATH_TRAITS_HPP
Modified: branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -71,7 +71,7 @@
namespace boost
{
- namespace filesystem3
+ namespace filesystem
{
BOOST_FILESYSTEM_DECL const boost::system::error_category& codecvt_error_category()
@@ -80,5 +80,5 @@
return codecvt_error_cat_const;
}
- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
Modified: branches/filesystem-v3/libs/filesystem/src/operations.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/operations.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/operations.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -58,10 +58,10 @@
# include <iostream>
#endif
-namespace fs = boost::filesystem3;
-using boost::filesystem3::path;
-using boost::filesystem3::filesystem_error;
-using boost::filesystem3::perms;
+namespace fs = boost::filesystem;
+using boost::filesystem::path;
+using boost::filesystem::filesystem_error;
+using boost::filesystem::perms;
using boost::system::error_code;
using boost::system::error_category;
using boost::system::system_category;
@@ -243,7 +243,7 @@
fs::file_type query_file_type(const path& p, error_code* ec);
- boost::filesystem3::directory_iterator end_dir_itr;
+ boost::filesystem::directory_iterator end_dir_itr;
const std::size_t buf_size(128);
const error_code ok;
@@ -699,7 +699,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
BOOST_FILESYSTEM_DECL
@@ -1852,7 +1852,7 @@
}
} // namespace path_traits
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
//--------------------------------------------------------------------------------------//
@@ -2075,7 +2075,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
namespace detail
@@ -2195,5 +2195,5 @@
}
}
} // namespace detail
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
Modified: branches/filesystem-v3/libs/filesystem/src/path.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/path.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/path.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -44,9 +44,9 @@
# include <iomanip>
#endif
-namespace fs = boost::filesystem3;
+namespace fs = boost::filesystem;
-using boost::filesystem3::path;
+using boost::filesystem::path;
using std::string;
using std::wstring;
@@ -140,7 +140,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
path& path::operator/=(const path& p)
{
@@ -439,7 +439,7 @@
return *this;
}
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
//--------------------------------------------------------------------------------------//
@@ -624,7 +624,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
path::iterator path::begin() const
{
@@ -738,7 +738,7 @@
it.m_element.m_pathname = separator_string; // generic format; see docs
}
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
//--------------------------------------------------------------------------------------//
@@ -812,7 +812,7 @@
namespace boost
{
-namespace filesystem3
+namespace filesystem
{
const path::codecvt_type*& path::wchar_t_codecvt_facet()
@@ -837,5 +837,5 @@
return temp;
}
-} // namespace filesystem3
+} // namespace filesystem
} // namespace boost
Modified: branches/filesystem-v3/libs/filesystem/src/path_traits.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/path_traits.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/path_traits.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -25,8 +25,8 @@
#include <cstring> // for strlen
#include <cwchar> // for wcslen
-namespace pt = boost::filesystem3::path_traits;
-namespace fs = boost::filesystem3;
+namespace pt = boost::filesystem::path_traits;
+namespace fs = boost::filesystem;
namespace bs = boost::system;
//--------------------------------------------------------------------------------------//
@@ -123,7 +123,7 @@
// path_traits //
//--------------------------------------------------------------------------------------//
-namespace boost { namespace filesystem3 { namespace path_traits {
+namespace boost { namespace filesystem { namespace path_traits {
//--------------------------------------------------------------------------------------//
// convert const char* to wstring //
@@ -197,4 +197,4 @@
convert_aux(from, from_end, buf, buf+default_codecvt_buf_size, to, cvt);
}
}
-}}} // namespace boost::filesystem3::path_traits
+}}} // namespace boost::filesystem::path_traits
Modified: branches/filesystem-v3/libs/filesystem/src/portability.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/portability.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/portability.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -20,7 +20,7 @@
#include <boost/filesystem/config.hpp>
#include <boost/filesystem/path.hpp>
-namespace fs = boost::filesystem3;
+namespace fs = boost::filesystem;
#include <cstring> // SGI MIPSpro compilers need this
@@ -47,7 +47,7 @@
namespace boost
{
- namespace filesystem3
+ namespace filesystem
{
// name_check functions ----------------------------------------------//
@@ -115,5 +115,5 @@
;
}
- } // namespace filesystem3
+ } // namespace filesystem
} // namespace boost
Modified: branches/filesystem-v3/libs/filesystem/src/unique_path.cpp
==============================================================================
--- branches/filesystem-v3/libs/filesystem/src/unique_path.cpp (original)
+++ branches/filesystem-v3/libs/filesystem/src/unique_path.cpp 2012-03-21 09:24:31 EDT (Wed, 21 Mar 2012)
@@ -105,7 +105,7 @@
} // unnamed namespace
-namespace boost { namespace filesystem3 { namespace detail {
+namespace boost { namespace filesystem { namespace detail {
BOOST_FILESYSTEM_DECL
path unique_path(const path& model, system::error_code* ec)