diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-03-05 19:06:20 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-03-05 19:06:20 +0000 |
| commit | 78a87e8a683d155b5287c8b1a50eef1ab51d0438 (patch) | |
| tree | 1795b686f73222c123bd09f7c9de513abcd8c8da /libcxx/include/map | |
| parent | f27217ffaff36ec12419e86713ee534c374bf2c5 (diff) | |
| download | bcm5719-llvm-78a87e8a683d155b5287c8b1a50eef1ab51d0438.tar.gz bcm5719-llvm-78a87e8a683d155b5287c8b1a50eef1ab51d0438.zip | |
Implement LWG 2193. Default constructors for standard library containers are explicit. Note that libc++ already did this for string/deque/forward_list/list/vector and the unordered containers; implement it for set/multiset/map/multimap. Add tests for all the containers. Two drive-by fixes as well: add a missing explicit in <deque>, and remove a tab that snuck into a container test. This issue is also LLVM bug 15724, and resolves it.
llvm-svn: 202994
Diffstat (limited to 'libcxx/include/map')
| -rw-r--r-- | libcxx/include/map | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/map b/libcxx/include/map index 9779b70e212..16127a5d76b 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -835,7 +835,7 @@ public: typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator; _LIBCPP_INLINE_VISIBILITY - explicit map(const key_compare& __comp = key_compare()) + map(const key_compare& __comp = key_compare()) _NOEXCEPT_( is_nothrow_default_constructible<allocator_type>::value && is_nothrow_default_constructible<key_compare>::value && @@ -1568,7 +1568,7 @@ public: typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator; _LIBCPP_INLINE_VISIBILITY - explicit multimap(const key_compare& __comp = key_compare()) + multimap(const key_compare& __comp = key_compare()) _NOEXCEPT_( is_nothrow_default_constructible<allocator_type>::value && is_nothrow_default_constructible<key_compare>::value && |
