Changeset 1280 for cpp

Timestamp:

09/10/23 01:51:57 (16 months ago)

Author:

Maciej Komosinski

Message:

Added explicit type casts (size_t vs. int etc.)

Location:

cpp

Files:

• common/nonstd_math.cpp (modified) (1 diff)
• frams/genetics/f9/f9_conv.cpp (modified) (1 diff)
• frams/genetics/fF/fF_oper.cpp (modified) (1 diff)
• frams/genetics/fL/fL_general.cpp (modified) (3 diffs)
• frams/model/autoname.cpp (modified) (1 diff)
• frams/model/model.cpp (modified) (1 diff)
• frams/model/modelparts.h (modified) (2 diffs)
• frams/model/similarity/simil-match.cpp (modified) (1 diff)
• frams/util/sstring-simple.cpp (modified) (4 diffs)

cpp/common/nonstd_math.cpp

@@ -89 +89 @@
 
 namespace fpExcept
-{ //shared for all platform, using crossplatform constants, can be defined in build_config (but also conditionally changed from the code)
+{ //shared for all platforms, using crossplatform constants, can be defined in build_config (but also conditionally changed from the code)
 int wanted_exceptions =
 #ifdef WANTED_FP_EXCEPTIONS

cpp/frams/genetics/f9/f9_conv.cpp

@@ -92 +92 @@
 int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices, const XYZ_LOC &vertex)
 {
-        for (size_t i = 0; i < vertices.size(); i++)
+        for (int i = 0; i < vertices.size(); i++)
                 if (vertices[i].same_coordinates(vertex)) return i;
         return -1;

cpp/frams/genetics/fF/fF_oper.cpp

@@ -49 +49 @@
         par.load(gene);
         static const int propsToMutate[] = fF_PROPS_TO_MUTATE;
-        int which = rndUint(std::size(propsToMutate));
+        int which = rndUint((unsigned int)std::size(propsToMutate));
         bool mutated_ok = GenoOperators::mutatePropertyNaive(par.param, propsToMutate[which]);
         if (mutated_ok)

cpp/frams/genetics/fL/fL_general.cpp

@@ -555 +555 @@
         //branch->processDefinition(this);
 
-        builtincount = words.size();
+        builtincount = (int)words.size();
 }
 
@@ -1383 +1383 @@
 int fL_Builder::countDefinedWords()
 {
-        return words.size() - builtincount;
+        return (int)words.size() - builtincount;
 }
 
 int fL_Builder::countWordsInLSystem()
 {
-        int count = genotype.size();
+        size_t count = genotype.size();
         for (fL_Rule *rul : rules)
         {
@@ -1394 +1394 @@
         }
         count += words.size();
-        return count;
+        return int(count);
 }
 

cpp/frams/model/autoname.cpp

@@ -59 +59 @@
 static void przeplatanka(char *out, char *in1, char *in2)
 {
-        int d1 = strlen(in1), d2 = strlen(in2);
+        int d1 = (int)strlen(in1), d2 = (int)strlen(in2);
         int p1 = 0, p2 = 0;
         int pp = d1 + d2;

cpp/frams/model/model.cpp

@@ -610 +610 @@
 int Model::getCheckpointCount()
 {
-        return checkpoints.size();
+        return (int)checkpoints.size();
 }
 

cpp/frams/model/modelparts.h

@@ -229 +229 @@
         SString name, longname, description;
         ParamEntry *props;
-        bool ownedprops;//< destructor will free props using ParamObject::freeParamTab
+        bool ownedprops; //< destructor will free props using ParamObject::freeParamTab
         paInt prefinputs, prefoutput;
         paInt preflocation;
@@ -304 +304 @@
                 return vectordata;
         }
-        void setSymbolGlyph(int *data, bool owned = 1)
+        void setSymbolGlyph(int *data, bool owned = true)
         {
                 if (vectordata && ownedvectordata) delete[]vectordata;
-                vectordata = data; ownedvectordata = owned;
+                vectordata = data;
+                ownedvectordata = owned;
         }
         /** additional information about how the neuron should be drawn

cpp/frams/model/similarity/simil-match.cpp

@@ -69 +69 @@
 
         // return the result
-        return m_apvMatched[Obj]->size();
+        return (int)m_apvMatched[Obj]->size();
 }
 

cpp/frams/util/sstring-simple.cpp

@@ -78 +78 @@
 void SString::endWrite(int newlength)
 {
-        if (newlength < 0) newlength = strlen(txt);
+        if (newlength < 0) newlength = (int)strlen(txt);
         else
         {
@@ -95 +95 @@
 void SString::endAppend(int newappend)
 {
-        if (newappend < 0) endWrite(appending + strlen(txt + appending));
+        if (newappend < 0) endWrite(appending + (int)strlen(txt + appending));
         else endWrite(newappend + appending);
 }
@@ -104 +104 @@
 {
         if (!s) return;
-        int x = strlen(s);
+        int x = (int)strlen(s);
         if (!x) return;
         append(s, x);
@@ -137 +137 @@
 {
         if (!ch) chlen = 0;
-        else if (chlen < 0) chlen = strlen(ch);
+        else if (chlen < 0) chlen = (int)strlen(ch);
         if (chlen)
         {