diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-03 15:25:20 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-03 15:25:20 +0300 |
commit | 395b294b614f43faac0ffaef167aed1b94a53b8e (patch) | |
tree | fb91d677fe1648d3646a6ba1f18e6f323aa77cd2 /tests | |
parent | 5fbf70b0d0c5a387d01bba4b4d536d166e16ac0e (diff) |
Cleanup: use nested namespaces
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/functions/FN_array_spans_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_attributes_ref_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_cpp_type_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_generic_vector_array_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_multi_function_network_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_multi_function_test.cc | 6 | ||||
-rw-r--r-- | tests/gtests/functions/FN_spans_test.cc | 6 |
7 files changed, 14 insertions, 28 deletions
diff --git a/tests/gtests/functions/FN_array_spans_test.cc b/tests/gtests/functions/FN_array_spans_test.cc index 21e52a90e4b..fa483ebf0f8 100644 --- a/tests/gtests/functions/FN_array_spans_test.cc +++ b/tests/gtests/functions/FN_array_spans_test.cc @@ -22,8 +22,7 @@ #include "BLI_array.hh" -namespace blender { -namespace fn { +namespace blender::fn { TEST(virtual_array_span, EmptyConstructor) { @@ -145,5 +144,4 @@ TEST(generic_virtual_array_span, IsSingleArray2) EXPECT_FALSE(converted.is_single_array()); } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_attributes_ref_test.cc b/tests/gtests/functions/FN_attributes_ref_test.cc index 111190564e5..eda4592d214 100644 --- a/tests/gtests/functions/FN_attributes_ref_test.cc +++ b/tests/gtests/functions/FN_attributes_ref_test.cc @@ -20,8 +20,7 @@ #include "testing/testing.h" -namespace blender { -namespace fn { +namespace blender::fn { TEST(attributes_info, BuildEmpty) { @@ -110,5 +109,4 @@ TEST(mutable_attributes_ref, ComplexTest) EXPECT_EQ(ids[2], 100); } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_cpp_type_test.cc b/tests/gtests/functions/FN_cpp_type_test.cc index 33e6fbee7f6..f6ae0877ed1 100644 --- a/tests/gtests/functions/FN_cpp_type_test.cc +++ b/tests/gtests/functions/FN_cpp_type_test.cc @@ -18,8 +18,7 @@ #include "FN_cpp_type.hh" -namespace blender { -namespace fn { +namespace blender::fn { static const int default_constructed_value = 1; static const int copy_constructed_value = 2; @@ -306,5 +305,4 @@ TEST(cpp_type, FillUninitialized) EXPECT_EQ(buffer2[9], 0); } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_generic_vector_array_test.cc b/tests/gtests/functions/FN_generic_vector_array_test.cc index c701fb9f678..3308913a72e 100644 --- a/tests/gtests/functions/FN_generic_vector_array_test.cc +++ b/tests/gtests/functions/FN_generic_vector_array_test.cc @@ -19,8 +19,7 @@ #include "testing/testing.h" -namespace blender { -namespace fn { +namespace blender::fn { TEST(generic_vector_array, Constructor) { @@ -114,5 +113,4 @@ TEST(generic_vector_array, Extend) EXPECT_EQ(ref[0][0], 3); } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_multi_function_network_test.cc b/tests/gtests/functions/FN_multi_function_network_test.cc index a5fe3c4fb07..07068aecdb6 100644 --- a/tests/gtests/functions/FN_multi_function_network_test.cc +++ b/tests/gtests/functions/FN_multi_function_network_test.cc @@ -21,8 +21,7 @@ #include "FN_multi_function_network.hh" #include "FN_multi_function_network_evaluation.hh" -namespace blender { -namespace fn { +namespace blender::fn { TEST(multi_function_network, Test1) { @@ -266,5 +265,4 @@ TEST(multi_function_network, Test2) } } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_multi_function_test.cc b/tests/gtests/functions/FN_multi_function_test.cc index 903c385ea67..07dffeeb948 100644 --- a/tests/gtests/functions/FN_multi_function_test.cc +++ b/tests/gtests/functions/FN_multi_function_test.cc @@ -20,8 +20,7 @@ #include "FN_multi_function.hh" #include "FN_multi_function_builder.hh" -namespace blender { -namespace fn { +namespace blender::fn { class AddFunction : public MultiFunction { public: @@ -330,5 +329,4 @@ TEST(multi_function, CustomMF_Constant) EXPECT_EQ(outputs[3], 42); } -} // namespace fn -} // namespace blender +} // namespace blender::fn diff --git a/tests/gtests/functions/FN_spans_test.cc b/tests/gtests/functions/FN_spans_test.cc index 59797f69309..43deb80ed23 100644 --- a/tests/gtests/functions/FN_spans_test.cc +++ b/tests/gtests/functions/FN_spans_test.cc @@ -19,8 +19,7 @@ #include "FN_cpp_types.hh" #include "FN_spans.hh" -namespace blender { -namespace fn { +namespace blender::fn { TEST(generic_span, TypeConstructor) { @@ -227,5 +226,4 @@ TEST(generic_virtual_span, SingleConstructor) EXPECT_EQ(converted[2], 5); } -} // namespace fn -} // namespace blender +} // namespace blender::fn |