[libcxx] r217936 - K-ballo pointed out *another* mistype in my change

Marshall Clow mclow.lists at gmail.com
Tue Sep 16 18:58:15 PDT 2014


Author: marshall
Date: Tue Sep 16 20:58:15 2014
New Revision: 217936

URL: http://llvm.org/viewvc/llvm-project?rev=217936&view=rev
Log:
K-ballo pointed out *another* mistype in my change

Modified:
    libcxx/trunk/include/istream
    libcxx/trunk/include/ostream

Modified: libcxx/trunk/include/istream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/istream?rev=217936&r1=217935&r2=217936&view=diff
==============================================================================
--- libcxx/trunk/include/istream (original)
+++ libcxx/trunk/include/istream Tue Sep 16 20:58:15 2014
@@ -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:
 

Modified: libcxx/trunk/include/ostream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ostream?rev=217936&r1=217935&r2=217936&view=diff
==============================================================================
--- libcxx/trunk/include/ostream (original)
+++ libcxx/trunk/include/ostream Tue Sep 16 20:58:15 2014
@@ -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:
 





More information about the cfe-commits mailing list