diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-08-12 21:56:02 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-08-12 21:56:02 +0000 |
| commit | 54976f2619ab9ccd321acf46dde4c15baeb84694 (patch) | |
| tree | 43d2d54cc7b628da57bae18fb1031d29fb32896f /libcxx/include/set | |
| parent | c53dd2ac01eb3044da996ad5b8d30ef85a18cda5 (diff) | |
| download | bcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.tar.gz bcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.zip | |
Fixed PR10574: http://llvm.org/bugs/show_bug.cgi?id=10574
llvm-svn: 137522
Diffstat (limited to 'libcxx/include/set')
| -rw-r--r-- | libcxx/include/set | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libcxx/include/set b/libcxx/include/set index 9248fd79b24..fe3d382768e 100644 --- a/libcxx/include/set +++ b/libcxx/include/set @@ -437,6 +437,7 @@ public: set(set&& __s, const allocator_type& __a); #endif +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY set(initializer_list<value_type> __il, const value_compare& __comp = value_compare()) : __tree_(__comp) @@ -458,6 +459,7 @@ public: __tree_.__assign_unique(__il.begin(), __il.end()); return *this; } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY @@ -542,9 +544,11 @@ public: __tree_.__insert_unique(__e, *__f); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY void insert(initializer_list<value_type> __il) {insert(__il.begin(), __il.end());} +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __p) {return __tree_.erase(__p);} @@ -771,6 +775,7 @@ public: multiset(multiset&& __s, const allocator_type& __a); #endif +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY multiset(initializer_list<value_type> __il, const value_compare& __comp = value_compare()) : __tree_(__comp) @@ -792,6 +797,7 @@ public: __tree_.__assign_multi(__il.begin(), __il.end()); return *this; } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY @@ -876,9 +882,11 @@ public: __tree_.__insert_multi(__e, *__f); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY void insert(initializer_list<value_type> __il) {insert(__il.begin(), __il.end());} +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __p) {return __tree_.erase(__p);} |
