commit 34ba5b95ca9dc2665c6c5dc8d5af80ca92d3f579
author Eric Fiselier <eric@efcs.ca> Thu Jul 21 03:20:17 2016 +0000
committer Eric Fiselier <eric@efcs.ca> Thu Jul 21 03:20:17 2016 +0000
tree 9a89ce1fdecd02913f3b4927f43fec84a643d44f
parent b2cea071cc578d5513f65d8e293a6123400c467c

Implement P0084r2. Changing emplace return types.

llvm-svn: 276230
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 0e411641a338b0effbdcbcd6f0772a0663729afd

include/vector

diff --git a/include/vector b/include/vector
index 021bbfb..16d48ae 100644
--- a/include/vector
+++ b/include/vector
@@ -99,7 +99,7 @@
     void push_back(const value_type& x);
     void push_back(value_type&& x);
     template <class... Args>
-        void emplace_back(Args&&... args);
+        reference emplace_back(Args&&... args);
     void pop_back();
 
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);
@@ -218,7 +218,7 @@
     const_reference back() const;
 
     void push_back(const value_type& x);
-    template <class... Args> void emplace_back(Args&&... args);  // C++14
+    template <class... Args> reference emplace_back(Args&&... args);  // C++14
     void pop_back();
 
     template <class... Args> iterator emplace(const_iterator position, Args&&... args);  // C++14
@@ -687,7 +687,7 @@
 #ifndef _LIBCPP_HAS_NO_VARIADICS
     template <class... _Args>
         _LIBCPP_INLINE_VISIBILITY
-        void emplace_back(_Args&&... __args);
+        reference emplace_back(_Args&&... __args);
 #endif  // _LIBCPP_HAS_NO_VARIADICS
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
     _LIBCPP_INLINE_VISIBILITY
@@ -1632,7 +1632,7 @@
 template <class _Tp, class _Allocator>
 template <class... _Args>
 inline
-void
+typename vector<_Tp, _Allocator>::reference
 vector<_Tp, _Allocator>::emplace_back(_Args&&... __args)
 {
     if (this->__end_ < this->__end_cap())
@@ -1646,6 +1646,7 @@
     }
     else
         __emplace_back_slow_path(_VSTD::forward<_Args>(__args)...);
+    return this->back();
 }
 
 #endif  // _LIBCPP_HAS_NO_VARIADICS
@@ -2314,8 +2315,10 @@
     void push_back(const value_type& __x);
 #if _LIBCPP_STD_VER > 11
     template <class... _Args>
-    _LIBCPP_INLINE_VISIBILITY void emplace_back(_Args&&... __args)
-        { push_back ( value_type ( _VSTD::forward<_Args>(__args)... )); }
+    _LIBCPP_INLINE_VISIBILITY reference emplace_back(_Args&&... __args) {
+        push_back ( value_type ( _VSTD::forward<_Args>(__args)... ));
+        return this->back();
+    }
 #endif
 
     _LIBCPP_INLINE_VISIBILITY void pop_back() {--__size_;}