Fixed return value from push operations

Grzegorz Jabłoński
1 parent 236e44aa
Showing 3 changed files with 10 additions and 18 deletions
examples11/04-vectortmpl/vector.h
examples11/05-foldexpr/testvector.cpp
examples11/05-foldexpr/vector.h
@@ -138,8 +138,7 @@ public:
     //    cout << "emplace_back" << endl;
     resize_before_push();
     new (data + size) C(std::forward<Args>(args)...);
-    ++size;
-    return *(data + size);
+    return *(data + size++);
   }
 #if 1
@@ -147,24 +146,21 @@ public:
     //    cout << "push_back with rvalue argument" << endl;
     resize_before_push();
     new (data + size) C(std::move(s));
-//    new (data + size) C(s);
-    ++size;
-    return *(data + size);
+    //    new (data + size) C(s);
+    return *(data + size++);
   }
   C &push_back(const C &s) {
     //    cout << "push_back with reference argument" << endl;
     resize_before_push();
     new (data + size) C(s);
-    ++size;
-    return *(data + size);
+    return *(data + size++);
   }
 #else
   template <class T> C &push_back(T &&s) {
     resize_before_push();
     new (data + size) C(std::forward<T>(s));
-    ++size;
-    return *(data + size);
+    return *(data + size++);
   }
 #endif
 };
@@ -22,8 +22,8 @@ main ()
   a.push_back(8);
   a.push_back(9);
   a.push_back(10);
-  a.push_back(11);
-  a.push_back(12,13,14);
+  cout << a.push_back(11) << endl;
+  cout << a.push_back(12,13,14) << endl;
   int arg = 15;
   a.push_back(arg);
   b=a;
@@ -138,23 +138,19 @@ public:
     //    cout << "emplace_back" << endl;
     resize_before_push();
     new (data + size) C(std::forward<Args>(args)...);
-    ++size;
-    return *(data + size);
+    return *(data + size++);
   }
 private:
   template <class T> C &push_back_single(T &&s) {
     resize_before_push();
     new (data + size) C(std::forward<T>(s));
-    ++size;
-    return *(data + size);
+    return *(data + size++);
   }
-public:
+public:
   template <class... Args> C &push_back(Args &&... args) {
     return (push_back_single(std::forward<Args>(args)), ...);
   }
-
-
 };
 #endif /* __VECTOR_H__ */