Changeset 1108 for cpp/frams/genetics/f4

Timestamp:

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

Author:

Maciej Komosinski

Message:

Avoided potentially dangerous subtraction from unsigned int

Location:

cpp/frams/genetics/f4

Files:

• f4_general.cpp (modified) (3 diffs)
• f4_oper.cpp (modified) (3 diffs)

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;
                                 }
                         }