Changeset 1108 for cpp

Timestamp:

03/15/21 15:57:32 (4 years ago)

Author:

Maciej Komosinski

Message:

Avoided potentially dangerous subtraction from unsigned int

Location:

cpp

Files:

• common/nonstd_stl.h (modified) (1 diff)
• frams/genetics/f4/f4_general.cpp (modified) (3 diffs)
• frams/genetics/f4/f4_oper.cpp (modified) (3 diffs)
• frams/genetics/f9/f9_conv.cpp (modified) (1 diff)
• frams/genetics/fS/fS_general.cpp (modified) (2 diffs)

cpp/common/nonstd_stl.h

@@ -48 +48 @@
 
 //final and no longer needed version ;-) (c++17)
-#define ARRAY_LENGTH(x) std::size(x)
+#define ARRAY_LENGTH(x) int(std::size(x))
 
 

cpp/frams/genetics/f4/f4_general.cpp

@@ -1388 +1388 @@
                         else // ran out
                         {
-                                node1 = new f4_node(">", par, strlen(genot) - 1);
+                                node1 = new f4_node(">", par, int(strlen(genot)) - 1);
                                 par = node1;
                         }
@@ -1427 +1427 @@
                         else // ran out
                         {
-                                node1 = new f4_node(">", par, strlen(genot) - 1);
+                                node1 = new f4_node(">", par, int(strlen(genot)) - 1);
                         }
                         return 0;  // OK
@@ -1566 +1566 @@
                 if (par->name != ">")
                 {
-                        node1 = new f4_node('>', par, strlen(genot) - 1);
+                        node1 = new f4_node('>', par, int(strlen(genot)) - 1);
                         par = node1;
                 }

cpp/frams/genetics/f4/f4_oper.cpp

@@ -186 +186 @@
                                                         if (g->ordNode(i) == n3)
                                                         {
-                                                                neuronid = neulist.size() - 1;
+                                                                neuronid = int(neulist.size()) - 1;
                                                         }
                                                 }
@@ -236 +236 @@
                                         if (gcur == par)
                                         {
-                                                neuronid = neulist.size() - 1;
+                                                neuronid = int(neulist.size()) - 1;
                                         }
                                 }
@@ -395 +395 @@
                                 if (gcur == n1)
                                 {
-                                        neuronid = neulist.size() - 1;
+                                        neuronid = int(neulist.size()) - 1;
                                 }
                         }

cpp/frams/genetics/f9/f9_conv.cpp

@@ -107 +107 @@
 
         vertices.push_back(new_vertex);
-        return vertices.size() - 1;
+        return int(vertices.size()) - 1;
 }
 

cpp/frams/genetics/fS/fS_general.cpp

@@ -684 +684 @@
 
                 int genoStart = modeSeparatorIndex + 1;
-                Substring substring(geno.c_str(), genoStart, geno.length() - genoStart);
+                Substring substring(geno.c_str(), genoStart, int(geno.length()) - genoStart);
                 startNode = new Node(substring, nullptr, genotypeParams);
                 validateNeuroInputs();
@@ -853 +853 @@
 {
         vector<Node*> allNodes = getAllNodes();
-        return allNodes[fromIndex + rndUint(allNodes.size() - fromIndex)];
+        return allNodes[fromIndex + rndUint(int(allNodes.size()) - fromIndex)];
 }