[libcxx] r217876 - Some of the synopsis was left out of these headers, and the copy construction/assignment should have been marked as deleted. Done. No functionality change, because the base class (base_ios) was marked as non-copyable already.

[Marshall Clow]

Author: marshall
Date: Tue Sep 16 10:27:01 2014
New Revision: 217876

URL: http://llvm.org/viewvc/llvm-project?rev=217876&view=rev
Log:
Some of the synopsis was left out of these headers, and the copy construction/assignment should have been marked as deleted. Done. No functionality change, because the base class (base_ios) was marked as non-copyable already.

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=217876&r1=217875&r2=217876&view=diff
==============================================================================
--- libcxx/trunk/include/istream (original)
+++ libcxx/trunk/include/istream Tue Sep 16 10:27:01 2014
@@ -82,6 +82,13 @@ public:
     pos_type tellg();
     basic_istream& seekg(pos_type);
     basic_istream& seekg(off_type, ios_base::seekdir);
+protected:
+    basic_istream(const basic_istream& rhs) = delete;
+    basic_istream(basic_istream&& rhs);
+    // 27.7.2.1.2 Assign/swap:
+    basic_istream& operator=(const basic_istream& rhs) = delete;
+    basic_istream& operator=(basic_istream&& rhs);
+    void swap(basic_istream& rhs);
 };
 
 // 27.7.1.2.3 character extraction templates:
@@ -184,13 +191,21 @@ protected:
     _LIBCPP_INLINE_VISIBILITY
     basic_istream(basic_istream&& __rhs);
 #endif
-
     // 27.7.1.1.2 Assign/swap:
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     _LIBCPP_INLINE_VISIBILITY
     basic_istream& operator=(basic_istream&& __rhs);
 #endif
     void swap(basic_istream& __rhs);
+
+#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
+    basic_istream           (basic_istream& __rhs) = delete;
+    basic_istream& operator=(basic_istream& __rhs) = delete;
+#else
+private:
+    basic_istream           (basic_istream& __rhs);
+    basic_istream& operator=(basic_istream& __rhs);
+#endif
 public:
 
     // 27.7.1.1.3 Prefix/suffix:

Modified: libcxx/trunk/include/ostream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ostream?rev=217876&r1=217875&r2=217876&view=diff
==============================================================================
--- libcxx/trunk/include/ostream (original)
+++ libcxx/trunk/include/ostream Tue Sep 16 10:27:01 2014
@@ -67,6 +67,13 @@ public:
     pos_type tellp();
     basic_ostream& seekp(pos_type);
     basic_ostream& seekp(off_type, ios_base::seekdir);
+protected:
+    basic_ostream(const basic_ostream& rhs) = delete;
+    basic_ostream(basic_ostream&& rhs);
+    // 27.7.3.3 Assign/swap
+    basic_ostream& operator=(basic_ostream& rhs) = delete;
+    basic_ostream& operator=(const basic_ostream&& rhs);
+    void swap(basic_ostream& rhs);
 };
 
 // 27.7.2.6.4 character inserters
@@ -170,6 +177,15 @@ protected:
     basic_ostream& operator=(basic_ostream&& __rhs);
 #endif
     void swap(basic_ostream& __rhs);
+
+#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
+    basic_ostream           (basic_ostream& __rhs) = delete;
+    basic_ostream& operator=(basic_ostream& __rhs) = delete;
+#else
+private:
+    basic_ostream           (basic_ostream& __rhs);
+    basic_ostream& operator=(basic_ostream& __rhs);
+#endif
 public:
 
     // 27.7.2.4 Prefix/suffix: