diff options
| author |   hop311 <hop3114@gmail.com> | 2023-11-06 21:39:40 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2023-11-07 19:35:38 +0100 |
| commit | d30421fa7d7f6ad87d3f90cc0ab491742f0d2548 (patch) | |
| tree | 601591215af0c6724766019ebb577141ea5807c5 /src/openvic-simulation/types | |
| parent | b5bbeb47febc823517a5baba4eca66f32fb3609c (diff) | |
History loading generalisation
Diffstat (limited to 'src/openvic-simulation/types')
| -rw-r--r-- | src/openvic-simulation/types/IdentifierRegistry.hpp | 12 |
1 files changed, 9 insertions, 3 deletions
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 { |