[PATCH] D16791: unordered_map: Match emplace_hint logic when _LIBCPP_DEBUG, NFC

[Duncan P. N. Exon Smith via cfe-commits]

dexonsmith created this revision.
dexonsmith added a reviewer: EricWF.
dexonsmith added a subscriber: cfe-commits.

When `!defined(_LIBCPP_DEBUG)`, unordered_map::emplace_hint() forwards
to emplace().  Do the same when `defined(_LIBCPP_DEBUG)`.

This has no real functionality change, just unifies the logic as a
prep commit.


http://reviews.llvm.org/D16791

Files:
  include/unordered_map

Index: include/unordered_map
===================================================================
--- include/unordered_map
+++ include/unordered_map
@@ -932,7 +932,7 @@
             _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
                 "unordered_map::emplace_hint(const_iterator, args...) called 
with an iterator not"
                 " referring to this unordered_map");
-            return 
__table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
+            return emplace(_VSTD::forward<_Args>(__args)...).first;
         }
 #else
         iterator emplace_hint(const_iterator, _Args&&... __args)



Index: include/unordered_map
===================================================================
--- include/unordered_map
+++ include/unordered_map
@@ -932,7 +932,7 @@
             _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
                 "unordered_map::emplace_hint(const_iterator, args...) called with an iterator not"
                 " referring to this unordered_map");
-            return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
+            return emplace(_VSTD::forward<_Args>(__args)...).first;
         }
 #else
         iterator emplace_hint(const_iterator, _Args&&... __args)

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits