diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-17 15:15:06 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-17 15:15:06 +0300 |
commit | 267923604754a50064c04a925a841a6714253d72 (patch) | |
tree | fc55f50254c428b1c94f760988d7cd9a5c9f75cf /tests/gtests/functions/FN_array_spans_test.cc | |
parent | 3ef59121a49b986700747469850e02f6420ee8aa (diff) |
Cleanup: avoid static initialization order issues when accessing CPPTypes
Instead of depending on static initialization order of globals use
static variables within functions. Those are initialized on first use.
This is every so slighly less efficient, but avoids a full class of problems.
Diffstat (limited to 'tests/gtests/functions/FN_array_spans_test.cc')
-rw-r--r-- | tests/gtests/functions/FN_array_spans_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/gtests/functions/FN_array_spans_test.cc b/tests/gtests/functions/FN_array_spans_test.cc index 988d48fa452..6912a62ff17 100644 --- a/tests/gtests/functions/FN_array_spans_test.cc +++ b/tests/gtests/functions/FN_array_spans_test.cc @@ -3,7 +3,6 @@ #include "testing/testing.h" #include "FN_array_spans.hh" -#include "FN_cpp_types.hh" #include "FN_generic_vector_array.hh" #include "BLI_array.hh" @@ -77,7 +76,7 @@ TEST(virtual_array_span, MultipleArrayConstructor) TEST(generic_virtual_array_span, TypeConstructor) { - GVArraySpan span{CPPType_int32}; + GVArraySpan span{CPPType::get<int32_t>()}; EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); @@ -88,7 +87,7 @@ TEST(generic_virtual_array_span, TypeConstructor) TEST(generic_virtual_array_span, GSpanConstructor) { std::array<std::string, 3> values = {"hello", "world", "test"}; - GVArraySpan span{GSpan(CPPType_string, values.data(), 3), 5}; + GVArraySpan span{GSpan(CPPType::get<std::string>(), values.data(), 3), 5}; EXPECT_EQ(span.size(), 5); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0][0], values.data()); @@ -119,7 +118,7 @@ TEST(generic_virtual_array_span, IsSingleArray1) TEST(generic_virtual_array_span, IsSingleArray2) { - GVectorArray vectors{CPPType_int32, 3}; + GVectorArray vectors{CPPType::get<int32_t>(), 3}; GVectorArrayRef<int> vectors_ref = vectors; vectors_ref.append(1, 4); |