From d6e023f3a0d8baaf3d5468f63ca3f5c696e61569 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 1 May 2015 18:55:33 +0100 Subject: [PATCH] fs_dir.h: Fix use of non-reserved names. * include/experimental/fs_dir.h: Fix use of non-reserved names. * include/experimental/fs_ops.h: Likewise. * include/experimental/fs_path.h: Likewise. * testsuite/lib/libstdc++.exp (check_v3_target_filesystem_ts): Use C++11 when checking for support. From-SVN: r222695 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/experimental/fs_dir.h | 12 ++++++------ libstdc++-v3/include/experimental/fs_ops.h | 16 ++++++++-------- libstdc++-v3/include/experimental/fs_path.h | 16 ++++++++-------- libstdc++-v3/testsuite/lib/libstdc++.exp | 6 ++++++ 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 540413c47b4..5428727a198 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2015-05-01 Jonathan Wakely + * include/experimental/fs_dir.h: Fix use of non-reserved names. + * include/experimental/fs_ops.h: Likewise. + * include/experimental/fs_path.h: Likewise. + * testsuite/lib/libstdc++.exp (check_v3_target_filesystem_ts): Use + C++11 when checking for support. + * include/bits/locale_classes.h (locale::facet): Delete copy operations in C++11 mode. diff --git a/libstdc++-v3/include/experimental/fs_dir.h b/libstdc++-v3/include/experimental/fs_dir.h index 0538fd2a697..d46d41bfb02 100644 --- a/libstdc++-v3/include/experimental/fs_dir.h +++ b/libstdc++-v3/include/experimental/fs_dir.h @@ -180,14 +180,14 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 directory_options __options, error_code& __ec) noexcept : directory_iterator(__p, __options, &__ec) { } - directory_iterator(const directory_iterator& rhs) = default; + directory_iterator(const directory_iterator& __rhs) = default; - directory_iterator(directory_iterator&& rhs) noexcept = default; + directory_iterator(directory_iterator&& __rhs) noexcept = default; ~directory_iterator() = default; - directory_iterator& operator=(const directory_iterator& rhs) = default; - directory_iterator& operator=(directory_iterator&& rhs) noexcept = default; + directory_iterator& operator=(const directory_iterator& __rhs) = default; + directory_iterator& operator=(directory_iterator&& __rhs) noexcept = default; const directory_entry& operator*() const; const directory_entry* operator->() const { return &**this; } @@ -269,9 +269,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 // modifiers recursive_directory_iterator& - operator=(const recursive_directory_iterator& rhs) noexcept; + operator=(const recursive_directory_iterator& __rhs) noexcept; recursive_directory_iterator& - operator=(recursive_directory_iterator&& rhs) noexcept; + operator=(recursive_directory_iterator&& __rhs) noexcept; recursive_directory_iterator& operator++(); recursive_directory_iterator& increment(error_code& __ec) noexcept; diff --git a/libstdc++-v3/include/experimental/fs_ops.h b/libstdc++-v3/include/experimental/fs_ops.h index 0878fbb8f8d..6b7d4709ee5 100644 --- a/libstdc++-v3/include/experimental/fs_ops.h +++ b/libstdc++-v3/include/experimental/fs_ops.h @@ -53,8 +53,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION path absolute(const path& __p, const path& __base = current_path()); path canonical(const path& __p, const path& __base = current_path()); - path canonical(const path& p, error_code& ec); - path canonical(const path& p, const path& base, error_code& ec); + path canonical(const path& __p, error_code& __ec); + path canonical(const path& __p, const path& __base, error_code& __ec); inline void copy(const path& __from, const path& __to) @@ -64,8 +64,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION copy(const path& __from, const path& __to, error_code& __ec) noexcept { copy(__from, __to, copy_options::none, __ec); } - void copy(const path& __from, const path& __to, copy_options options); - void copy(const path& __from, const path& __to, copy_options options, + void copy(const path& __from, const path& __to, copy_options __options); + void copy(const path& __from, const path& __to, copy_options __options, error_code& __ec) noexcept; inline bool @@ -239,12 +239,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION file_time_type last_write_time(const path& __p); file_time_type last_write_time(const path& __p, error_code& __ec) noexcept; - void last_write_time(const path& __p, file_time_type new_time); - void last_write_time(const path& __p, file_time_type new_time, + void last_write_time(const path& __p, file_time_type __new_time); + void last_write_time(const path& __p, file_time_type __new_time, error_code& __ec) noexcept; - void permissions(const path& __p, perms prms); - void permissions(const path& __p, perms prms, error_code& __ec) noexcept; + void permissions(const path& __p, perms __prms); + void permissions(const path& __p, perms __prms, error_code& __ec) noexcept; path read_symlink(const path& __p); path read_symlink(const path& __p, error_code& __ec); diff --git a/libstdc++-v3/include/experimental/fs_path.h b/libstdc++-v3/include/experimental/fs_path.h index ffc49266b7a..11b05616150 100644 --- a/libstdc++-v3/include/experimental/fs_path.h +++ b/libstdc++-v3/include/experimental/fs_path.h @@ -423,9 +423,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 void _M_split_cmpts(); void _M_trim(); - void _M_add_root_name(size_t n); - void _M_add_root_dir(size_t pos); - void _M_add_filename(size_t pos, size_t n); + void _M_add_root_name(size_t __n); + void _M_add_root_dir(size_t __pos); + void _M_add_filename(size_t __pos, size_t __n); string_type _M_pathname; @@ -681,10 +681,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 iterator operator--(int) { auto __tmp = *this; --_M_cur; return __tmp; } friend bool operator==(const iterator& __lhs, const iterator& __rhs) - { return __lhs.equals(__rhs); } + { return __lhs._M_equals(__rhs); } friend bool operator!=(const iterator& __lhs, const iterator& __rhs) - { return !__lhs.equals(__rhs); } + { return !__lhs._M_equals(__rhs); } private: friend class path; @@ -697,7 +697,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 : _M_path(__path), _M_cur(), _M_at_end(__at_end) { } - bool equals(iterator) const; + bool _M_equals(iterator) const; const path* _M_path; path::_List::const_iterator _M_cur; @@ -749,7 +749,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 inline path::_Path<_CharT*, _CharT*>& path::operator+=(_CharT __x) { - auto* __addr = std::addressof(__x); + auto* __addr = std::__addressof(__x); return concat(__addr, __addr + 1); } @@ -990,7 +990,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 } inline bool - path::iterator::equals(iterator __rhs) const + path::iterator::_M_equals(iterator __rhs) const { if (_M_path != __rhs._M_path) return false; diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 7ae4f3fc054..7d8f2829de8 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1896,6 +1896,8 @@ proc check_v3_target_little_endian { } { } proc check_v3_target_filesystem_ts { } { + global cxxflags + global DEFAULT_CXXFLAGS global et_filesystem_ts global tool @@ -1930,7 +1932,11 @@ proc check_v3_target_filesystem_ts { } { puts $f "#endif" close $f + set cxxflags_saved $cxxflags + set cxxflags "$cxxflags $DEFAULT_CXXFLAGS -Werror -std=gnu++11" + set lines [v3_target_compile $src /dev/null preprocess ""] + set cxxflags $cxxflags_saved file delete $src if [string match "" $lines] { -- 2.30.2