kfr

commit a229a6dcabfb83dde41b5c0cb764a1f4d777084d
parent 0ad7506ee4df30ca18a0292214677e4f5c6054d5
Author: [email protected] <[email protected]>
Date:   Tue,  4 Dec 2018 22:21:07 +0000

Assignment to an empty vector should resize it

Diffstat:
M
include/kfr/base/univector.hpp
 | 
9
++++++++-
M
tests/expression_test.cpp
 | 
10
++++++++++

2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/include/kfr/base/univector.hpp b/include/kfr/base/univector.hpp
@@ -332,7 +332,14 @@ struct univector<T, tag_dynamic_vector> : std::vector<T, allocator<T>>,
     {
         return index < this->size() ? this->operator[](index) : fallback_value;
     }
-    using univector_base<T, univector>::operator=;
+    template <typename Input, KFR_ENABLE_IF(is_input_expression<Input>::value)>
+    CMT_INLINE univector& operator=(Input&& input)
+    {
+        if (this->empty())
+            this->resize(input.size());
+        this->assign_expr(std::forward<Input>(input));
+        return *this;
+    }
 };
 
 template <typename T>
diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp
@@ -85,6 +85,16 @@ TEST(placeholders_pointer)
     CHECK_EXPRESSION(expr, infinite_size, [](size_t i) { return 10.f * i; });
 }
 
+TEST(univector_assignment)
+{
+    univector<int> x = truncate(counter(), 10);
+    CHECK(x.size() == 10);
+
+    univector<int> y;
+    y = truncate(counter(), 10);
+    CHECK(y.size() == 10);
+}
+
 TEST(size_calc)
 {
     auto a = counter();