diff options
author | Hop311 <Hop3114@gmail.com> | 2024-06-13 01:25:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-13 01:25:21 +0200 |
commit | 01a8f60aaca9784d814f4cb35a3fc4be86e1dd20 (patch) | |
tree | ebc9c03b5bd0a6b11068ac37aca302f6ceb24a18 /src/openvic-simulation/types | |
parent | a49e4d0975e2b5dfd13ae50aa716f1a0307e618d (diff) | |
parent | c0ba822ee46551a40ad6b43e8f56b80e27ae35b5 (diff) |
Merge pull request #163 from OpenVicProject/good-instance
Add GoodInstance
Diffstat (limited to 'src/openvic-simulation/types')
-rw-r--r-- | src/openvic-simulation/types/HasIdentifier.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/types/HasIdentifier.hpp b/src/openvic-simulation/types/HasIdentifier.hpp index 9457e75..3f2d8a8 100644 --- a/src/openvic-simulation/types/HasIdentifier.hpp +++ b/src/openvic-simulation/types/HasIdentifier.hpp @@ -33,9 +33,9 @@ namespace OpenVic { HasIdentifier(std::string_view new_identifier): identifier { new_identifier } { assert(!identifier.empty()); } + HasIdentifier(HasIdentifier const&) = default; public: - HasIdentifier(HasIdentifier const&) = delete; HasIdentifier(HasIdentifier&&) = default; HasIdentifier& operator=(HasIdentifier const&) = delete; HasIdentifier& operator=(HasIdentifier&&) = delete; @@ -59,9 +59,9 @@ namespace OpenVic { _HasColour(ColourT new_colour, bool cannot_be_null): colour { new_colour } { assert(!cannot_be_null || !colour.is_null()); } + _HasColour(_HasColour const&) = default; public: - _HasColour(_HasColour const&) = delete; _HasColour(_HasColour&&) = default; _HasColour& operator=(_HasColour const&) = delete; _HasColour& operator=(_HasColour&&) = delete; @@ -75,9 +75,9 @@ namespace OpenVic { protected: _HasIdentifierAndColour(std::string_view new_identifier, ColourT new_colour, bool cannot_be_null) : HasIdentifier { new_identifier }, _HasColour<ColourT> { new_colour, cannot_be_null } {} + _HasIdentifierAndColour(_HasIdentifierAndColour const&) = default; public: - _HasIdentifierAndColour(_HasIdentifierAndColour const&) = delete; _HasIdentifierAndColour(_HasIdentifierAndColour&&) = default; _HasIdentifierAndColour& operator=(_HasIdentifierAndColour const&) = delete; _HasIdentifierAndColour& operator=(_HasIdentifierAndColour&&) = delete; |