From 171463faf54f1f0862007c481ed907f80bc5d63b Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sun, 7 Jun 2020 12:55:02 +0200 Subject: [PATCH] [[nodiscard]]: try to get around an issue with VS2017 (see #501) --- src/entt/core/monostate.hpp | 2 +- src/entt/entity/helper.hpp | 4 ++-- src/entt/resource/handle.hpp | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/entt/core/monostate.hpp b/src/entt/core/monostate.hpp index 582d03f55..e25dd5313 100644 --- a/src/entt/core/monostate.hpp +++ b/src/entt/core/monostate.hpp @@ -38,7 +38,7 @@ struct monostate { * @return Stored value, if any. */ template - [[nodiscard]] operator Type() const ENTT_NOEXCEPT { + operator Type() const ENTT_NOEXCEPT { return value; } diff --git a/src/entt/entity/helper.hpp b/src/entt/entity/helper.hpp index 3e2aca204..49bfb0c7f 100644 --- a/src/entt/entity/helper.hpp +++ b/src/entt/entity/helper.hpp @@ -36,7 +36,7 @@ struct as_view { * @return A newly created view. */ template - [[nodiscard]] operator entt::basic_view() const { + operator entt::basic_view() const { return reg.template view(Exclude{}); } @@ -86,7 +86,7 @@ struct as_group { * @return A newly created group. */ template - [[nodiscard]] operator entt::basic_group() const { + operator entt::basic_group() const { return reg.template group(Get{}, Exclude{}); } diff --git a/src/entt/resource/handle.hpp b/src/entt/resource/handle.hpp index a3ff5dd26..bc1070ce6 100644 --- a/src/entt/resource/handle.hpp +++ b/src/entt/resource/handle.hpp @@ -57,16 +57,24 @@ public: } /*! @copydoc get */ - [[nodiscard]] operator const Resource & () const ENTT_NOEXCEPT { return get(); } + [[nodiscard]] operator const Resource & () const ENTT_NOEXCEPT { + return get(); + } /*! @copydoc get */ - [[nodiscard]] operator Resource & () ENTT_NOEXCEPT { return get(); } + [[nodiscard]] operator Resource & () ENTT_NOEXCEPT { + return get(); + } /*! @copydoc get */ - [[nodiscard]] const Resource & operator *() const ENTT_NOEXCEPT { return get(); } + [[nodiscard]] const Resource & operator *() const ENTT_NOEXCEPT { + return get(); + } /*! @copydoc get */ - [[nodiscard]] Resource & operator *() ENTT_NOEXCEPT { return get(); } + [[nodiscard]] Resource & operator *() ENTT_NOEXCEPT { + return get(); + } /** * @brief Gets a pointer to the managed resource.