Changeset 1130 for cpp/frams/genetics/f9

Timestamp:

04/16/21 15:55:34 (4 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/genetics/f9/f9_conv.cpp (modified) (3 diffs)

cpp/frams/genetics/f9/f9_conv.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -6 +6 @@
 #include <frams/model/model.h>
 #include <string.h>
-#include <common/nonstd_stl.h> //ARRAY_LENGTH
 
 #define APPLY_DETERMINISTIC_BODY_NOISE //this genetic representation easily produces perfectly vertical sticks that would stay upright forever in simulation. In most cases such infinite perfection is not desired, so we make the construct less perfect by perturbing its coordinates.
@@ -129 +128 @@
         static int g[] = { 0, 1, 1, 1, 0, 0 };
         static int b[] = { 0, 0, 0, 1, 1, 1 };
-        int maxind = ARRAY_LENGTH(r) - 1;
+        int maxind = int(std::size(r)) - 1;
 
         int joints_count = m.getJointCount();