From: Paul Bauer Date: Thu, 9 Jan 2020 16:41:48 +0000 (+0100) Subject: Fix compiler warnings on windows X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=e0b301595c96d83684e927411a8461410c56e6e1;p=alexxy%2Fgromacs.git Fix compiler warnings on windows Came up during other builds, but didn't make any sense. Change-Id: Ie57f4ce30d35dbb1db927b91902045fbbcffe8f0 --- diff --git a/src/gromacs/topology/forcefieldparameters.h b/src/gromacs/topology/forcefieldparameters.h index 636e86668c..0534261219 100644 --- a/src/gromacs/topology/forcefieldparameters.h +++ b/src/gromacs/topology/forcefieldparameters.h @@ -55,7 +55,7 @@ struct gmx_ffparams_t { GMX_ASSERT(iparams.size() == functype.size(), "Parameters and function types go together"); - return gmx::ssize(functype); + return static_cast(functype.size()); } /* TODO: Consider merging functype and iparams, either by storing diff --git a/src/gromacs/topology/idef.h b/src/gromacs/topology/idef.h index b346e96fe3..e19e976c64 100644 --- a/src/gromacs/topology/idef.h +++ b/src/gromacs/topology/idef.h @@ -220,7 +220,7 @@ typedef int t_functype; struct InteractionList { /* Returns the total number of elements in iatoms */ - int size() const { return gmx::ssize(iatoms); } + int size() const { return static_cast(iatoms.size()); } /* List of interactions, see explanation further down */ std::vector iatoms; diff --git a/src/gromacs/topology/topology.h b/src/gromacs/topology/topology.h index f883afb0d8..d5b633ee06 100644 --- a/src/gromacs/topology/topology.h +++ b/src/gromacs/topology/topology.h @@ -132,7 +132,7 @@ struct SimulationGroups */ int numberOfGroupNumbers(SimulationAtomGroupType group) const { - return gmx::ssize(groupNumbers[group]); + return static_cast(groupNumbers[group].size()); } };