diff --git a/include/fixed_containers/enum_map.hpp b/include/fixed_containers/enum_map.hpp index 385e10ba..b69995fe 100644 --- a/include/fixed_containers/enum_map.hpp +++ b/include/fixed_containers/enum_map.hpp @@ -717,21 +717,6 @@ class EnumMap : public enum_map_detail::EnumMapBase using Self = EnumMap; using Base = enum_map_detail::EnumMapBase; -public: - using key_type = typename Base::key_type; - using mapped_type = typename Base::mapped_type; - using value_type = typename Base::value_type; - using reference = typename Base::reference; - using const_reference = typename Base::const_reference; - using pointer = typename Base::pointer; - using const_pointer = typename Base::const_pointer; - using const_iterator = typename Base::const_iterator; - using iterator = typename Base::iterator; - using const_reverse_iterator = typename Base::const_reverse_iterator; - using reverse_iterator = typename Base::reverse_iterator; - using size_type = typename Base::size_type; - using difference_type = typename Base::difference_type; - public: using Builder = enum_map_detail::EnumMapBuilder>; @@ -751,7 +736,7 @@ class EnumMap : public enum_map_detail::EnumMapBase template static constexpr EnumMapType create_with_all_entries( - std::initializer_list pairs, + std::initializer_list pairs, const std_transition::source_location& loc = std_transition::source_location::current()) { return Base::template create_with_all_entries(pairs, loc); @@ -792,7 +777,7 @@ class EnumMap : public enum_map_detail::EnumMapBase : Base(first, last) { } - constexpr EnumMap(std::initializer_list list) noexcept + constexpr EnumMap(std::initializer_list list) noexcept : Base(list) { } @@ -893,21 +878,6 @@ class EnumMap : public enum_map_detail::EnumMapBase; using Base = enum_map_detail::EnumMapBase; -public: - using key_type = typename Base::key_type; - using mapped_type = typename Base::mapped_type; - using value_type = typename Base::value_type; - using reference = typename Base::reference; - using const_reference = typename Base::const_reference; - using pointer = typename Base::pointer; - using const_pointer = typename Base::const_pointer; - using const_iterator = typename Base::const_iterator; - using iterator = typename Base::iterator; - using const_reverse_iterator = typename Base::const_reverse_iterator; - using reverse_iterator = typename Base::reverse_iterator; - using size_type = typename Base::size_type; - using difference_type = typename Base::difference_type; - public: using Builder = enum_map_detail::EnumMapBuilder; @@ -927,7 +897,7 @@ class EnumMap : public enum_map_detail::EnumMapBase static constexpr EnumMapType create_with_all_entries( - std::initializer_list pairs, + std::initializer_list pairs, const std_transition::source_location& loc = std_transition::source_location::current()) { return Base::template create_with_all_entries(pairs, loc); @@ -967,7 +937,7 @@ class EnumMap : public enum_map_detail::EnumMapBase list) noexcept + constexpr EnumMap(std::initializer_list list) noexcept : Base(list) { }