maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[optional] Update synopsis for LWG2934 

(comment-only change)

llvm-svn: 300488
This commit is contained in:
Casey Carter 2017-04-17 20:15:16 +00:00
parent d7523283a7
commit e3bdfe639c
13 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libcxx/include/optional
View File

@ -17,29 +17,31 @@
// C++1z // C++1z
namespace std { namespace std {
// 20.6.3, optional for object types // 23.6.3, optional for object types
template <class T> class optional; template <class T> class optional;
// 20.6.4, no-value state indicator // 23.6.4, no-value state indicator
struct nullopt_t{see below }; struct nullopt_t{see below };
constexpr nullopt_t nullopt(unspecified ); constexpr nullopt_t nullopt(unspecified );
// 20.6.5, class bad_optional_access // 23.6.5, class bad_optional_access
class bad_optional_access; class bad_optional_access;
// 20.6.6, relational operators // 23.6.6, relational operators
template <class T> template <class T, class U>
constexpr bool operator==(const optional<T>&, const optional<T>&); constexpr bool operator==(const optional<T>&, const optional<U>&);
template <class T> template <class T, class U>
constexpr bool operator!=(const optional<T>&, const optional<T>&); constexpr bool operator!=(const optional<T>&, const optional<U>&);
template <class T> template <class T, class U>
constexpr bool operator<(const optional<T>&, const optional<T>&); constexpr bool operator<(const optional<T>&, const optional<U>&);
template <class T> template <class T, class U>
constexpr bool operator>(const optional<T>&, const optional<T>&); constexpr bool operator>(const optional<T>&, const optional<U>&);
template <class T> template <class T, class U>
constexpr bool operator<=(const optional<T>&, const optional<T>&); constexpr bool operator<=(const optional<T>&, const optional<U>&);
template <class T> template <class T, class U>
constexpr bool operator>=(const optional<T>&, const optional<T>&); constexpr bool operator>=(const optional<T>&, const optional<U>&);
// 23.6.7 comparison with nullopt
template <class T> constexpr bool operator==(const optional<T>&, nullopt_t) noexcept; template <class T> constexpr bool operator==(const optional<T>&, nullopt_t) noexcept;
template <class T> constexpr bool operator==(nullopt_t, const optional<T>&) noexcept; template <class T> constexpr bool operator==(nullopt_t, const optional<T>&) noexcept;
template <class T> constexpr bool operator!=(const optional<T>&, nullopt_t) noexcept; template <class T> constexpr bool operator!=(const optional<T>&, nullopt_t) noexcept;
@ -53,21 +55,21 @@ namespace std {
template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept; template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept;
template <class T> constexpr bool operator>=(nullopt_t, const optional<T>&) noexcept; template <class T> constexpr bool operator>=(nullopt_t, const optional<T>&) noexcept;
// 20.6.8, comparison with T // 23.6.8, comparison with T
template <class T> constexpr bool operator==(const optional<T>&, const T&); template <class T, class U> constexpr bool operator==(const optional<T>&, const U&);
template <class T> constexpr bool operator==(const T&, const optional<T>&); template <class T, class U> constexpr bool operator==(const U&, const optional<T>&);
template <class T> constexpr bool operator!=(const optional<T>&, const T&); template <class T, class U> constexpr bool operator!=(const optional<T>&, const U&);
template <class T> constexpr bool operator!=(const T&, const optional<T>&); template <class T, class U> constexpr bool operator!=(const U&, const optional<T>&);
template <class T> constexpr bool operator<(const optional<T>&, const T&); template <class T, class U> constexpr bool operator<(const optional<T>&, const U&);
template <class T> constexpr bool operator<(const T&, const optional<T>&); template <class T, class U> constexpr bool operator<(const U&, const optional<T>&);
template <class T> constexpr bool operator<=(const optional<T>&, const T&); template <class T, class U> constexpr bool operator<=(const optional<T>&, const U&);
template <class T> constexpr bool operator<=(const T&, const optional<T>&); template <class T, class U> constexpr bool operator<=(const U&, const optional<T>&);
template <class T> constexpr bool operator>(const optional<T>&, const T&); template <class T, class U> constexpr bool operator>(const optional<T>&, const U&);
template <class T> constexpr bool operator>(const T&, const optional<T>&); template <class T, class U> constexpr bool operator>(const U&, const optional<T>&);
template <class T> constexpr bool operator>=(const optional<T>&, const T&); template <class T, class U> constexpr bool operator>=(const optional<T>&, const U&);
template <class T> constexpr bool operator>=(const T&, const optional<T>&); template <class T, class U> constexpr bool operator>=(const U&, const optional<T>&);
// 20.6.9, specialized algorithms // 23.6.9, specialized algorithms
template <class T> void swap(optional<T>&, optional<T>&) noexcept(see below ); template <class T> void swap(optional<T>&, optional<T>&) noexcept(see below );
template <class T> constexpr optional<see below > make_optional(T&&); template <class T> constexpr optional<see below > make_optional(T&&);
template <class T, class... Args> template <class T, class... Args>
@ -75,7 +77,7 @@ namespace std {
template <class T, class U, class... Args> template <class T, class U, class... Args>
constexpr optional<T> make_optional(initializer_list<U> il, Args&&... args); constexpr optional<T> make_optional(initializer_list<U> il, Args&&... args);
// 20.6.10, hash support // 23.6.10, hash support
template <class T> struct hash; template <class T> struct hash;
template <class T> struct hash<optional<T>>; template <class T> struct hash<optional<T>>;
@ -83,7 +85,7 @@ namespace std {
public: public:
using value_type = T; using value_type = T;
// 20.6.3.1, constructors // 23.6.3.1, constructors
constexpr optional() noexcept; constexpr optional() noexcept;
constexpr optional(nullopt_t) noexcept; constexpr optional(nullopt_t) noexcept;
optional(const optional &); optional(const optional &);
@ -98,10 +100,10 @@ namespace std {
template <class U> template <class U>
constexpr EXPLICIT optional(optional<U> &&); constexpr EXPLICIT optional(optional<U> &&);
// 20.6.3.2, destructor // 23.6.3.2, destructor
~optional(); ~optional();
// 20.6.3.3, assignment // 23.6.3.3, assignment
optional &operator=(nullopt_t) noexcept; optional &operator=(nullopt_t) noexcept;
optional &operator=(const optional &); optional &operator=(const optional &);
optional &operator=(optional &&) noexcept(see below ); optional &operator=(optional &&) noexcept(see below );
@ -112,10 +114,10 @@ namespace std {
template <class U, class... Args> template <class U, class... Args>
T& emplace(initializer_list<U>, Args &&...); T& emplace(initializer_list<U>, Args &&...);
// 20.6.3.4, swap // 23.6.3.4, swap
void swap(optional &) noexcept(see below ); void swap(optional &) noexcept(see below );
// 20.6.3.5, observers // 23.6.3.5, observers
constexpr T const *operator->() const; constexpr T const *operator->() const;
constexpr T *operator->(); constexpr T *operator->();
constexpr T const &operator*() const &; constexpr T const &operator*() const &;
@ -131,7 +133,7 @@ namespace std {
template <class U> constexpr T value_or(U &&) const &; template <class U> constexpr T value_or(U &&) const &;
template <class U> constexpr T value_or(U &&) &&; template <class U> constexpr T value_or(U &&) &&;
// 20.6.3.6, modifiers // 23.6.3.6, modifiers
void reset() noexcept; void reset() noexcept;
private: private:

4
libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator==(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator==(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator==(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator==(const U& v, const optional<T>& x);
#include <optional> #include <optional>

4
libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator>(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator>(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator>(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator>(const U& v, const optional<T>& x);
#include <optional> #include <optional>

4
libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator>=(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator>=(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator>=(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator>=(const U& v, const optional<T>& x);
#include <optional> #include <optional>

4
libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator<=(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator<=(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator<=(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator<=(const U& v, const optional<T>& x);
#include <optional> #include <optional>

4
libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator<(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator<(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator<(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator<(const U& v, const optional<T>& x);
#include <optional> #include <optional>

4
libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
View File

@ -10,8 +10,8 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator!=(const optional<T>& x, const T& v); // template <class T, class U> constexpr bool operator!=(const optional<T>& x, const U& v);
// template <class T> constexpr bool operator!=(const T& v, const optional<T>& x); // template <class T, class U> constexpr bool operator!=(const U& v, const optional<T>& x);
#include <optional> #include <optional>

2
libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator==(const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator==(const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>
#include <type_traits> #include <type_traits>

2
libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator>= (const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator>= (const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>

2
libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator> (const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator> (const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>

2
libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator<= (const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator<= (const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>

2
libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator< (const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator< (const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>

2
libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
View File

@ -10,7 +10,7 @@
// UNSUPPORTED: c++98, c++03, c++11, c++14 // UNSUPPORTED: c++98, c++03, c++11, c++14
// <optional> // <optional>
// template <class T> constexpr bool operator!=(const optional<T>& x, const optional<T>& y); // template <class T, class U> constexpr bool operator!=(const optional<T>& x, const optional<U>& y);
#include <optional> #include <optional>
#include <type_traits> #include <type_traits>