summaryrefslogtreecommitdiffstats
path: root/libcxx/include/map
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-07-01 19:24:36 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-07-01 19:24:36 +0000
commit5a33687da07cb8ffc68ef5065ed46bab5c4d6555 (patch)
treea040ca6f46310d29afc2a8f8b3337eb6c692a8eb /libcxx/include/map
parent68b0e8456e7934b97ffb22b07fdde705abd33fd1 (diff)
downloadbcm5719-llvm-5a33687da07cb8ffc68ef5065ed46bab5c4d6555.tar.gz
bcm5719-llvm-5a33687da07cb8ffc68ef5065ed46bab5c4d6555.zip
Correct for new rules regarding implicitly deleted special members. http://llvm.org/bugs/show_bug.cgi?id=10191
llvm-svn: 134248
Diffstat (limited to 'libcxx/include/map')
-rw-r--r--libcxx/include/map14
1 files changed, 14 insertions, 0 deletions
diff --git a/libcxx/include/map b/libcxx/include/map
index 9405617cccd..2bb352376b9 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -755,6 +755,13 @@ public:
insert(__m.begin(), __m.end());
}
+ _LIBCPP_INLINE_VISIBILITY
+ map& operator=(const map& __m)
+ {
+ __tree_ = __m.__tree_;
+ return *this;
+ }
+
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
@@ -1497,6 +1504,13 @@ public:
insert(__m.begin(), __m.end());
}
+ _LIBCPP_INLINE_VISIBILITY
+ multimap& operator=(const multimap& __m)
+ {
+ __tree_ = __m.__tree_;
+ return *this;
+ }
+
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
OpenPOWER on IntegriCloud