From 172ad2fcc34b567eab9eca1f907cd99574fa031e Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 29 Aug 2024 19:54:58 +0100 Subject: Remove unnecessary asserts + make `vec2_t(T val)` constructor explicit --- src/openvic-simulation/map/Mapmode.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/openvic-simulation/map/Mapmode.cpp') diff --git a/src/openvic-simulation/map/Mapmode.cpp b/src/openvic-simulation/map/Mapmode.cpp index cab67d1..f951a05 100644 --- a/src/openvic-simulation/map/Mapmode.cpp +++ b/src/openvic-simulation/map/Mapmode.cpp @@ -1,7 +1,5 @@ #include "Mapmode.hpp" -#include - #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/map/MapDefinition.hpp" #include "openvic-simulation/map/MapInstance.hpp" @@ -13,10 +11,12 @@ using namespace OpenVic; using namespace OpenVic::colour_literals; Mapmode::Mapmode( - std::string_view new_identifier, index_t new_index, colour_func_t new_colour_func -) : HasIdentifier { new_identifier }, HasIndex { new_index }, colour_func { new_colour_func } { - assert(colour_func != nullptr); -} + std::string_view new_identifier, + index_t new_index, + colour_func_t new_colour_func +) : HasIdentifier { new_identifier }, + HasIndex { new_index }, + colour_func { new_colour_func } {} const Mapmode Mapmode::ERROR_MAPMODE { "mapmode_error", 0, [](MapInstance const&, ProvinceInstance const& province) -> base_stripe_t { -- cgit v1.2.3-56-ga3b1