Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 13:33:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 13:36:37 +0300
commit2193e28dfc05d08f96b91a9b010b4c5de75f948d (patch)
treeb15d4eb4ba7864cf91c7bf3eb0fbe854d97ee41a
parente9a7f4d389047cfecc0b3150fbf406f65cf5117d (diff)
USD Test: Don't use designated initializers
This isn't really in C++ standard, some corner cases work in some compilers (like when all fields are specified), but in general they do not work. For some reason MSVC builder started to complain about it now, weird but better not rely on compiler specifics.
-rw-r--r--tests/gtests/usd/abstract_hierarchy_iterator_test.cc30
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 1ca0ad93470..d9148a7b289 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -276,10 +276,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
// Even when only asking an export of transforms, on the first frame everything should be
// exported.
- iterator->set_export_subset({
- .transforms = true,
- .shapes = false,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = true;
+ export_subset.shapes = false;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(expected_transforms, iterator->transform_writers);
EXPECT_EQ(expected_data, iterator->data_writers);
@@ -298,10 +300,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
iterator->data_writers.clear();
// Third iteration, should only write data now.
- iterator->set_export_subset({
- .transforms = false,
- .shapes = true,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = false;
+ export_subset.shapes = true;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(0, iterator->transform_writers.size());
EXPECT_EQ(expected_data, iterator->data_writers);
@@ -311,10 +315,12 @@ TEST_F(USDHierarchyIteratorTest, ExportSubsetTest)
iterator->data_writers.clear();
// Fourth iteration, should export everything now.
- iterator->set_export_subset({
- .transforms = true,
- .shapes = true,
- });
+ {
+ ExportSubset export_subset = {0};
+ export_subset.transforms = true;
+ export_subset.shapes = true;
+ iterator->set_export_subset(export_subset);
+ }
iterator->iterate_and_write();
EXPECT_EQ(expected_transforms, iterator->transform_writers);
EXPECT_EQ(expected_data, iterator->data_writers);