push_back internally using emplace_back

Grzegorz Jabłoński
1 parent 56b9b36d
Showing 3 changed files with 5 additions and 11 deletions
examples11/04-vectortmpl/vector.h
examples11/05-foldexpr/vector.h
examples11/06-template_metaprogramming/vector.h
@@ -27,7 +27,7 @@ private:
   void resize_before_push() {
     if (size >= cap) {
       if (cap > std::numeric_limits<decltype(size)>::max() / (2 * sizeof(C)))
-        throw bad_alloc();
+        throw length_error("Vector too long");
       unsigned int newcap = (cap == 0) ? 1 : 2 * cap;
       C *newdata;
       if constexpr (!std::is_trivially_copyable<C>()) {
@@ -27,7 +27,7 @@ private:
   void resize_before_push() {
     if (size >= cap) {
       if (cap > std::numeric_limits<decltype(size)>::max() / (2 * sizeof(C)))
-        throw bad_alloc();
+        throw std::length_error("Vector too long");
       unsigned int newcap = (cap == 0) ? 1 : 2 * cap;
       C *newdata;
       if constexpr (!std::is_trivially_copyable<C>()) {
@@ -54,7 +54,7 @@ private:
   void resize_before_push() {
     if (size >= cap) {
       if (cap > std::numeric_limits<decltype(size)>::max() / (2 * sizeof(C)))
-        throw bad_alloc();
+        throw length_error("Vector too long");
       reserve_internal((cap == 0) ? 1 : 2 * cap);
     }
   }
@@ -147,26 +147,20 @@ public:
   }
 private:
-  template <class T> C &push_back_single(T &&s) {
-    resize_before_push();
-    new (data + size) C(std::forward<T>(s));
-    return *(data + size++);
-  }
 public:
   void reserve(unsigned capacity) {
     if (capacity > std::numeric_limits<decltype(size)>::max() / (2 * sizeof(C)))
-      throw bad_alloc();
+      throw length_error("Vector too long");
     unsigned int cap_rounded_up = round_up_to_power_of_2(capacity);
     reserve_internal(cap_rounded_up);
   }
   template <class T> std::tuple<C &> push_back(T &&s) {
-    C &r = push_back_single(std::forward<C>(s));
+    C &r = emplace_back(std::forward<C>(s));
     return std::tuple<C &>(r);
   }
-public:
   template <class T, class... Args> auto push_back(T &&a, Args &&... args) {
     auto op1 = push_back(std::forward<C>(a));
     auto op2 = push_back(args...);