From 114017d550052f73d82bd06d636de589e339acb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Tue, 28 Feb 2023 14:57:23 +0100 Subject: [PATCH] Fix msvc error due to narrowing conversion --- src/simulation/Particle.cpp | 4 ++-- src/simulation/Particle.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/simulation/Particle.cpp b/src/simulation/Particle.cpp index 55a0b54d8..8963b9e75 100644 --- a/src/simulation/Particle.cpp +++ b/src/simulation/Particle.cpp @@ -33,11 +33,11 @@ std::vector const &Particle::GetPropertyAliases() return aliases; } -std::vector const &Particle::PossiblyCarriesType() +std::vector const &Particle::PossiblyCarriesType() { struct DoOnce { - std::vector indices = { + std::vector indices = { FIELD_LIFE, FIELD_CTYPE, FIELD_TMP, diff --git a/src/simulation/Particle.h b/src/simulation/Particle.h index 4827c7122..3114093ba 100644 --- a/src/simulation/Particle.h +++ b/src/simulation/Particle.h @@ -18,7 +18,7 @@ struct Particle by higher-level processes referring to them by name such as Lua or the property tool **/ static std::vector const &GetProperties(); static std::vector const &GetPropertyAliases(); - static std::vector const &PossiblyCarriesType(); + static std::vector const &PossiblyCarriesType(); }; // important: these are indices into the vector returned by Particle::GetProperties, not indices into Particle