From d30421fa7d7f6ad87d3f90cc0ab491742f0d2548 Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 6 Nov 2023 20:39:40 +0000 Subject: History loading generalisation --- src/openvic-simulation/types/IdentifierRegistry.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/openvic-simulation/types/IdentifierRegistry.hpp') diff --git a/src/openvic-simulation/types/IdentifierRegistry.hpp b/src/openvic-simulation/types/IdentifierRegistry.hpp index 734421d..1121956 100644 --- a/src/openvic-simulation/types/IdentifierRegistry.hpp +++ b/src/openvic-simulation/types/IdentifierRegistry.hpp @@ -68,9 +68,7 @@ namespace OpenVic { */ class HasIdentifierAndColour : public HasIdentifier, public HasColour { protected: - HasIdentifierAndColour( - std::string_view new_identifier, colour_t new_colour, bool cannot_be_null, bool can_have_alpha - ); + HasIdentifierAndColour(std::string_view new_identifier, colour_t new_colour, bool cannot_be_null, bool can_have_alpha); public: HasIdentifierAndColour(HasIdentifierAndColour const&) = delete; @@ -237,9 +235,17 @@ namespace OpenVic { }); \ } +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4003) +#endif GETTERS() GETTERS(const) +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + #undef GETTERS bool has_identifier(std::string_view identifier) const { -- cgit v1.2.3-56-ga3b1