generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@217876 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2014-09-16 15:27:01 +00:00
parent 7ba3c57565
commit 546eca8dc6
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/istream
View File

@ -82,6 +82,13 @@ public:
pos_type tellg(); pos_type tellg();
basic_istream& seekg(pos_type); basic_istream& seekg(pos_type);
basic_istream& seekg(off_type, ios_base::seekdir); 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: // 27.7.1.2.3 character extraction templates:
@ -184,13 +191,21 @@ protected:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
basic_istream(basic_istream&& __rhs); basic_istream(basic_istream&& __rhs);
#endif #endif
// 27.7.1.1.2 Assign/swap: // 27.7.1.1.2 Assign/swap:
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
basic_istream& operator=(basic_istream&& __rhs); basic_istream& operator=(basic_istream&& __rhs);
#endif #endif
void swap(basic_istream& __rhs); 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: public:
// 27.7.1.1.3 Prefix/suffix: // 27.7.1.1.3 Prefix/suffix:

16
include/ostream
View File

@ -67,6 +67,13 @@ public:
pos_type tellp(); pos_type tellp();
basic_ostream& seekp(pos_type); basic_ostream& seekp(pos_type);
basic_ostream& seekp(off_type, ios_base::seekdir); 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 // 27.7.2.6.4 character inserters
@ -170,6 +177,15 @@ protected:
basic_ostream& operator=(basic_ostream&& __rhs); basic_ostream& operator=(basic_ostream&& __rhs);
#endif #endif
void swap(basic_ostream& __rhs); 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: public:
// 27.7.2.4 Prefix/suffix: // 27.7.2.4 Prefix/suffix: