From 75d43162806d7876b48c358c13c591bf9e7e4d43 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Aug 2016 16:10:14 -0400 Subject: [PATCH] Fix build error about passing initializer-list to constructor. VS2013 is not happy with using initializer-list to initialize vector parameters to explicit constructors taking one vector. --- test/opt/test_types.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/opt/test_types.cpp b/test/opt/test_types.cpp index df8d873..4ed4f87 100644 --- a/test/opt/test_types.cpp +++ b/test/opt/test_types.cpp @@ -80,7 +80,8 @@ TestMultipleInstancesOfTheSameType(Sampler); TestMultipleInstancesOfTheSameType(SampledImage, image_t_.get()); TestMultipleInstancesOfTheSameType(Array, u32_t_.get(), 10); TestMultipleInstancesOfTheSameType(RuntimeArray, u32_t_.get()); -TestMultipleInstancesOfTheSameType(Struct, {u32_t_.get(), f64_t_.get()}); +TestMultipleInstancesOfTheSameType(Struct, std::vector{u32_t_.get(), + f64_t_.get()}); TestMultipleInstancesOfTheSameType(Opaque, "testing rocks"); TestMultipleInstancesOfTheSameType(Pointer, u32_t_.get(), SpvStorageClassInput); TestMultipleInstancesOfTheSameType(Function, u32_t_.get(), @@ -166,10 +167,10 @@ TEST(Types, AllTypes) { auto* rav3s32 = types.back().get(); // Struct - types.emplace_back(new Struct({s32})); - types.emplace_back(new Struct({s32, f32})); + types.emplace_back(new Struct(std::vector{s32})); + types.emplace_back(new Struct(std::vector{s32, f32})); auto* sts32f32 = types.back().get(); - types.emplace_back(new Struct({u64, a42f32, rav3s32})); + types.emplace_back(new Struct(std::vector{u64, a42f32, rav3s32})); // Opaque types.emplace_back(new Opaque("")); -- 2.7.4