use SmallVector in GenericConcat

3 files changed, 10 insertions, 10 deletions

diff --git a/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp b/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
index 637a1633f0f..09ac2e413c1 100644
--- a/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
+++ b/eval/src/tests/instruction/generic_concat/generic_concat_test.cpp
@@ -109,16 +109,16 @@ TEST(GenericConcatTest, dense_concat_plan_can_be_created) {
     EXPECT_EQ(plan.right_offset, 5*2*3*3*4);
     EXPECT_EQ(plan.output_size, 2*3*12*2*3*3*4);
     EXPECT_EQ(plan.left.input_size, 2*3*5*2*3);
-    std::vector<size_t> expect_left_loop  = {    6,  5,  6, 12 };
-    std::vector<size_t> expect_left_in_s  = {   30,  6,  1,  0 };
-    std::vector<size_t> expect_left_out_s = {  864, 72, 12,  1 };
+    SmallVector<size_t> expect_left_loop  = {    6,  5,  6, 12 };
+    SmallVector<size_t> expect_left_in_s  = {   30,  6,  1,  0 };
+    SmallVector<size_t> expect_left_out_s = {  864, 72, 12,  1 };
     EXPECT_EQ(plan.left.in_loop_cnt, expect_left_loop);
     EXPECT_EQ(plan.left.in_stride, expect_left_in_s);
     EXPECT_EQ(plan.left.out_stride, expect_left_out_s);
     EXPECT_EQ(plan.right.input_size, 2*3*7*3*4);
-    std::vector<size_t> expect_right_loop =  {   6,  7,  6, 12 };
-    std::vector<size_t> expect_right_in_s =  {  84, 12,  0,  1 };
-    std::vector<size_t> expect_right_out_s = { 864, 72, 12,  1 };
+    SmallVector<size_t> expect_right_loop =  {   6,  7,  6, 12 };
+    SmallVector<size_t> expect_right_in_s =  {  84, 12,  0,  1 };
+    SmallVector<size_t> expect_right_out_s = { 864, 72, 12,  1 };
     EXPECT_EQ(plan.right.in_loop_cnt, expect_right_loop);
     EXPECT_EQ(plan.right.in_stride, expect_right_in_s);
     EXPECT_EQ(plan.right.out_stride, expect_right_out_s);
diff --git a/eval/src/vespa/eval/instruction/generic_concat.cpp b/eval/src/vespa/eval/instruction/generic_concat.cpp
index 989e921b8fb..3c16fe3eb7e 100644
--- a/eval/src/vespa/eval/instruction/generic_concat.cpp
+++ b/eval/src/vespa/eval/instruction/generic_concat.cpp
@@ -169,7 +169,7 @@ DenseConcatPlan::InOutLoop::fill_from(const ValueType &in_type,
                                       std::string concat_dimension,
                                       const ValueType &out_type)
 {
-    std::vector<size_t> out_loop_cnt;
+    SmallVector<size_t> out_loop_cnt;
     Case prev_case = Case::NONE;
     auto update_plan = [&](Case my_case, size_t in_size, size_t out_size, size_t in_val, size_t out_val) {
         if (my_case == prev_case) {
diff --git a/eval/src/vespa/eval/instruction/generic_concat.h b/eval/src/vespa/eval/instruction/generic_concat.h
index 5578c5a0dca..2c9b79a2b4e 100644
--- a/eval/src/vespa/eval/instruction/generic_concat.h
+++ b/eval/src/vespa/eval/instruction/generic_concat.h
@@ -24,9 +24,9 @@ struct DenseConcatPlan {
     size_t output_size;
     struct InOutLoop {
         size_t input_size;
-        std::vector<size_t> in_loop_cnt;
-        std::vector<size_t> in_stride;
-        std::vector<size_t> out_stride;
+        SmallVector<size_t> in_loop_cnt;
+        SmallVector<size_t> in_stride;
+        SmallVector<size_t> out_stride;
         // returns computed concat offset and output size
         std::pair<size_t, size_t> fill_from(const ValueType &in_type,
                                             std::string concat_dimension,