From bb9902ec97cd2d8f34c316eafe75437af2ff46b0 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 17 Sep 2014 01:58:15 +0000 Subject: [PATCH] K-ballo pointed out *another* mistype in my change git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217936 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/istream | 7 ++++--- include/ostream | 8 ++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/istream b/include/istream index 47631ba2..168a4d06 100644 --- a/include/istream +++ b/include/istream @@ -198,13 +198,14 @@ protected: #endif void swap(basic_istream& __rhs); +#if _LIBCPP_STD_VER > 11 #ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS basic_istream (const basic_istream& __rhs) = delete; basic_istream& operator=(const basic_istream& __rhs) = delete; #else -private: - basic_istream (const basic_istream& __rhs); - basic_istream& operator=(const basic_istream& __rhs); + basic_istream (const basic_istream& __rhs); // not defined + basic_istream& operator=(const basic_istream& __rhs); // not defined +#endif #endif public: diff --git a/include/ostream b/include/ostream index 2e27070f..a7af2994 100644 --- a/include/ostream +++ b/include/ostream @@ -169,9 +169,6 @@ protected: #endif // 27.7.2.3 Assign/swap -#if _LIBCPP_STD_VER > 11 - basic_ostream& operator=(const basic_ostream&) = delete; -#endif #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY basic_ostream& operator=(basic_ostream&& __rhs); @@ -182,9 +179,8 @@ protected: basic_ostream (const basic_ostream& __rhs) = delete; basic_ostream& operator=(const basic_ostream& __rhs) = delete; #else -private: - basic_ostream (const basic_ostream& __rhs); - basic_ostream& operator=(const basic_ostream& __rhs); + basic_ostream (const basic_ostream& __rhs); // not defined + basic_ostream& operator=(const basic_ostream& __rhs); // not defined #endif public: