diff --git a/libcxx/include/barrier b/libcxx/include/barrier --- a/libcxx/include/barrier +++ b/libcxx/include/barrier @@ -126,7 +126,7 @@ __barrier_base(ptrdiff_t __expected, _CompletionF __completion = _CompletionF()) : __expected(__expected), __base(__construct_barrier_algorithm_base(this->__expected), &__destroy_barrier_algorithm_base), - __expected_adjustment(0), __completion(move(__completion)), __phase(0) + __expected_adjustment(0), __completion(_VSTD::move(__completion)), __phase(0) { } [[nodiscard]] _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY @@ -190,7 +190,7 @@ _LIBCPP_INLINE_VISIBILITY __barrier_base(ptrdiff_t __expected, _CompletionF __completion = _CompletionF()) - : __expected(__expected), __arrived(__expected), __completion(move(__completion)), __phase(false) + : __expected(__expected), __arrived(__expected), __completion(_VSTD::move(__completion)), __phase(false) { } [[nodiscard]] _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY diff --git a/libcxx/include/valarray b/libcxx/include/valarray --- a/libcxx/include/valarray +++ b/libcxx/include/valarray @@ -1536,21 +1536,21 @@ gslice(size_t __start, const valarray& __size, valarray&& __stride) : __size_(__size), - __stride_(move(__stride)) + __stride_(_VSTD::move(__stride)) {__init(__start);} _LIBCPP_INLINE_VISIBILITY gslice(size_t __start, valarray&& __size, const valarray& __stride) - : __size_(move(__size)), + : __size_(_VSTD::move(__size)), __stride_(__stride) {__init(__start);} _LIBCPP_INLINE_VISIBILITY gslice(size_t __start, valarray&& __size, valarray&& __stride) - : __size_(move(__size)), - __stride_(move(__stride)) + : __size_(_VSTD::move(__size)), + __stride_(_VSTD::move(__stride)) {__init(__start);} #endif // _LIBCPP_CXX03_LANG @@ -1701,7 +1701,7 @@ #ifndef _LIBCPP_CXX03_LANG gslice_array(gslice&& __gs, const valarray& __v) : __vp_(const_cast(__v.__begin_)), - __1d_(move(__gs.__1d_)) + __1d_(_VSTD::move(__gs.__1d_)) {} #endif // _LIBCPP_CXX03_LANG @@ -2395,7 +2395,7 @@ _LIBCPP_INLINE_VISIBILITY indirect_array(valarray&& __ia, const valarray& __v) : __vp_(const_cast(__v.__begin_)), - __1d_(move(__ia)) + __1d_(_VSTD::move(__ia)) {} #endif // _LIBCPP_CXX03_LANG @@ -2614,7 +2614,7 @@ _LIBCPP_INLINE_VISIBILITY __indirect_expr(valarray&& __ia, const _RmExpr& __e) : __expr_(__e), - __1d_(move(__ia)) + __1d_(_VSTD::move(__ia)) {} #endif // _LIBCPP_CXX03_LANG @@ -3209,7 +3209,7 @@ __val_expr<__indirect_expr&> > valarray<_Tp>::operator[](gslice&& __gs) const { - return __val_expr<__indirect_expr >(__indirect_expr(move(__gs.__1d_), *this)); + return __val_expr<__indirect_expr >(__indirect_expr(_VSTD::move(__gs.__1d_), *this)); } template @@ -3217,7 +3217,7 @@ gslice_array<_Tp> valarray<_Tp>::operator[](gslice&& __gs) { - return gslice_array(move(__gs), *this); + return gslice_array(_VSTD::move(__gs), *this); } #endif // _LIBCPP_CXX03_LANG @@ -3245,7 +3245,7 @@ __val_expr<__mask_expr&> > valarray<_Tp>::operator[](valarray&& __vb) const { - return __val_expr<__mask_expr >(__mask_expr(move(__vb), *this)); + return __val_expr<__mask_expr >(__mask_expr(_VSTD::move(__vb), *this)); } template @@ -3253,7 +3253,7 @@ mask_array<_Tp> valarray<_Tp>::operator[](valarray&& __vb) { - return mask_array(move(__vb), *this); + return mask_array(_VSTD::move(__vb), *this); } #endif // _LIBCPP_CXX03_LANG @@ -3281,7 +3281,7 @@ __val_expr<__indirect_expr&> > valarray<_Tp>::operator[](valarray&& __vs) const { - return __val_expr<__indirect_expr >(__indirect_expr(move(__vs), *this)); + return __val_expr<__indirect_expr >(__indirect_expr(_VSTD::move(__vs), *this)); } template @@ -3289,7 +3289,7 @@ indirect_array<_Tp> valarray<_Tp>::operator[](valarray&& __vs) { - return indirect_array(move(__vs), *this); + return indirect_array(_VSTD::move(__vs), *this); } #endif // _LIBCPP_CXX03_LANG diff --git a/libcxx/src/filesystem/directory_iterator.cpp b/libcxx/src/filesystem/directory_iterator.cpp --- a/libcxx/src/filesystem/directory_iterator.cpp +++ b/libcxx/src/filesystem/directory_iterator.cpp @@ -25,8 +25,8 @@ __dir_stream& operator=(const __dir_stream&) = delete; __dir_stream(__dir_stream&& __ds) noexcept : __stream_(__ds.__stream_), - __root_(move(__ds.__root_)), - __entry_(move(__ds.__entry_)) { + __root_(_VSTD::move(__ds.__root_)), + __entry_(_VSTD::move(__ds.__entry_)) { __ds.__stream_ = INVALID_HANDLE_VALUE; } @@ -104,8 +104,8 @@ __dir_stream& operator=(const __dir_stream&) = delete; __dir_stream(__dir_stream&& other) noexcept : __stream_(other.__stream_), - __root_(move(other.__root_)), - __entry_(move(other.__entry_)) { + __root_(_VSTD::move(other.__root_)), + __entry_(_VSTD::move(other.__entry_)) { other.__stream_ = nullptr; } @@ -187,7 +187,7 @@ error_code m_ec; if (!__imp_->advance(m_ec)) { - path root = move(__imp_->__root_); + path root = _VSTD::move(__imp_->__root_); __imp_.reset(); if (m_ec) err.report(m_ec, "at root " PATH_CSTR_FMT, root.c_str()); @@ -221,7 +221,7 @@ __imp_ = make_shared<__shared_imp>(); __imp_->__options_ = opt; - __imp_->__stack_.push(move(new_s)); + __imp_->__stack_.push(_VSTD::move(new_s)); } void recursive_directory_iterator::__pop(error_code* ec) { @@ -275,7 +275,7 @@ } if (m_ec) { - path root = move(stack.top().__root_); + path root = _VSTD::move(stack.top().__root_); __imp_.reset(); err.report(m_ec, "at root " PATH_CSTR_FMT, root.c_str()); } else { @@ -309,7 +309,7 @@ if (!skip_rec) { __dir_stream new_it(curr_it.__entry_.path(), __imp_->__options_, m_ec); if (new_it.good()) { - __imp_->__stack_.push(move(new_it)); + __imp_->__stack_.push(_VSTD::move(new_it)); return true; } } @@ -320,7 +320,7 @@ if (ec) ec->clear(); } else { - path at_ent = move(curr_it.__entry_.__p_); + path at_ent = _VSTD::move(curr_it.__entry_.__p_); __imp_.reset(); err.report(m_ec, "attempting recursion into " PATH_CSTR_FMT, at_ent.c_str());