From 045baba7eab56b45767b9d9ab0ad66cb509dcd9a Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 28 Apr 2022 16:51:04 +0200 Subject: [PATCH] compressed_pair: re-add base_type to avoid breaking natvis --- src/entt/core/compressed_pair.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/entt/core/compressed_pair.hpp b/src/entt/core/compressed_pair.hpp index 1239206f4..6222ca1d0 100644 --- a/src/entt/core/compressed_pair.hpp +++ b/src/entt/core/compressed_pair.hpp @@ -50,18 +50,19 @@ template struct compressed_pair_element>>: Type { using reference = Type &; using const_reference = const Type &; + using base_type = Type; - template>> + template>> compressed_pair_element() - : Type{} {} + : base_type{} {} template>, compressed_pair_element>>> compressed_pair_element(Args &&args) - : Type{std::forward(args)} {} + : base_type{std::forward(args)} {} template compressed_pair_element(std::tuple args, std::index_sequence) - : Type{std::forward(std::get(args))...} {} + : base_type{std::forward(std::get(args))...} {} [[nodiscard]] reference get() ENTT_NOEXCEPT { return *this;