Skip to content

Commit

Permalink
Implement N4606 optional
Browse files Browse the repository at this point in the history
Summary:
Adapt implementation of Library Fundamentals TS optional into an implementation of N4606 optional.

  - Update relational operators per http://wg21.link/P0307
  - Update to requirements of http://wg21.link/P0032
  - Extension: Implement trivial copy/move construction/assignment for `optional<T>` when `T` is trivially copyable.

Audit P/Rs for optional LWG issues:
  - 2756 "C++ WP optional<T> should 'forward' T's implicit conversions" Implemented, which also resolves 2753 "Optional's constructors and assignments need constraints" (modulo my refusal to explicitly delete the move operations, which is a design error that I'm working on correcting in the 2756 P/R).
  - 2736 "nullopt_t insufficiently constrained" Already conforming. I've added a test ensuring that `nullopt_t` is not copy-initializable from an empty braced-init-list, which I believe is the root intent of the issue, to avoid regression.
  - 2740 "constexpr optional<T>::operator->" Already conforming.
  - 2746 "Inconsistency between requirements for emplace between optional and variant" No P/R, but note that the author's '"suggested resolution" is already implemented.
  - 2748 "swappable traits for optionals" Already conforming.
  - 2753 "Optional's constructors and assignments need constraints" Implemented.

Most of the work for this patch was done by Casey Carter @ Microsoft. Thank you Casey!



Reviewers: mclow.lists, CaseyCarter, EricWF

Differential Revision: https://reviews.llvm.org/D22741

llvm-svn: 283980
  • Loading branch information
EricWF committed Oct 12, 2016
1 parent 90d990e commit a9e6596
Show file tree
Hide file tree
Showing 86 changed files with 8,469 additions and 52 deletions.
3 changes: 3 additions & 0 deletions libcxx/.gitignore
Expand Up @@ -56,3 +56,6 @@ target/
# MSVC libraries test harness
env.lst
keep.lst

# Editor by-products
.vscode/
4 changes: 4 additions & 0 deletions libcxx/include/__config
Expand Up @@ -914,6 +914,10 @@ extern "C" void __sanitizer_annotate_contiguous_container(
#define _LIBCPP_SAFE_STATIC
#endif

#if !__has_builtin(__builtin_addressof) && _GNUC_VER < 700
#define _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF
#endif

#endif // __cplusplus

#endif // _LIBCPP_CONFIG

0 comments on commit a9e6596

Please sign in to comment.