diff --git a/include/etl/utility.h b/include/etl/utility.h index 95fa8475..f3ad9020 100644 --- a/include/etl/utility.h +++ b/include/etl/utility.h @@ -411,18 +411,18 @@ namespace etl }; #if ETL_CPP17_SUPPORTED - inline constexpr in_place_t in_place; + inline constexpr in_place_t in_place{}; #endif //************************* template struct in_place_type_t { - explicit ETL_CONSTEXPR in_place_type_t(){}; + explicit ETL_CONSTEXPR in_place_type_t() {}; }; #if ETL_CPP17_SUPPORTED template - inline constexpr in_place_type_t in_place_type; + inline constexpr in_place_type_t in_place_type{}; #endif //************************* @@ -433,7 +433,7 @@ namespace etl #if ETL_CPP17_SUPPORTED template - inline constexpr in_place_index_t in_place_index; + inline constexpr in_place_index_t in_place_index{}; #endif } diff --git a/test/test_variant_variadic.cpp b/test/test_variant_variadic.cpp index b9a13fe1..6c01e38a 100644 --- a/test/test_variant_variadic.cpp +++ b/test/test_variant_variadic.cpp @@ -478,19 +478,19 @@ namespace //************************************************************************* TEST(test_construct_multiple_parameters_by_type) { - test_variant_emplace variant_etl1(etl::in_place_type_t(), "1"); + test_variant_emplace variant_etl1(etl::in_place_type, "1"); CHECK(etl::holds_alternative(variant_etl1)); CHECK_EQUAL(D1("1"), etl::get(variant_etl1)); - test_variant_emplace variant_etl2(etl::in_place_type_t{}, "1", "2"); + test_variant_emplace variant_etl2(etl::in_place_type, "1", "2"); CHECK(etl::holds_alternative(variant_etl2)); CHECK_EQUAL(D2("1", "2"), etl::get(variant_etl2)); - test_variant_emplace variant_etl3(etl::in_place_type_t{}, "1", "2", "3"); + test_variant_emplace variant_etl3(etl::in_place_type, "1", "2", "3"); CHECK(etl::holds_alternative(variant_etl3)); CHECK_EQUAL(D3("1", "2", "3"), etl::get(variant_etl3)); - test_variant_emplace variant_etl4(etl::in_place_type_t{}, "1", "2", "3", "4"); + test_variant_emplace variant_etl4(etl::in_place_type, "1", "2", "3", "4"); CHECK(etl::holds_alternative(variant_etl4)); CHECK_EQUAL(D4("1", "2", "3", "4"), etl::get(variant_etl4)); } @@ -498,19 +498,19 @@ namespace //************************************************************************* TEST(test_construct_multiple_parameters_by_index) { - test_variant_emplace variant_etl1(etl::in_place_index_t<1U>{}, "1"); + test_variant_emplace variant_etl1(etl::in_place_index<1U>, "1"); CHECK(etl::holds_alternative(variant_etl1)); CHECK_EQUAL(D1("1"), etl::get(variant_etl1)); - test_variant_emplace variant_etl2(etl::in_place_index_t<2>{}, "1", "2"); + test_variant_emplace variant_etl2(etl::in_place_index<2>, "1", "2"); CHECK(etl::holds_alternative(variant_etl2)); CHECK_EQUAL(D2("1", "2"), etl::get(variant_etl2)); - test_variant_emplace variant_etl3(etl::in_place_index_t<3>{}, "1", "2", "3"); + test_variant_emplace variant_etl3(etl::in_place_index<3>, "1", "2", "3"); CHECK(etl::holds_alternative(variant_etl3)); CHECK_EQUAL(D3("1", "2", "3"), etl::get(variant_etl3)); - test_variant_emplace variant_etl4(etl::in_place_index_t<4U>{}, "1", "2", "3", "4"); + test_variant_emplace variant_etl4(etl::in_place_index<4U>, "1", "2", "3", "4"); CHECK(etl::holds_alternative(variant_etl4)); CHECK_EQUAL(D4("1", "2", "3", "4"), etl::get(variant_etl4)); }