Changeset 1130 for cpp/frams/genetics/geneprops.cpp

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/geneprops.cpp (modified) (2 diffs)

cpp/frams/genetics/geneprops.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "geneprops.h"
+#include <algorithm>
 
 GeneProps GeneProps::standard_values;
@@ -54 +55 @@
 #ifdef v1f1COMPATIBLE
         case 'L': length += (3.0 - length)*0.3;
-                length = min(length, Model::getMaxJoint().d.x); break;
+                length = std::min(length, Model::getMaxJoint().d.x); break;
 #else
         case 'L': length += (2.0 - length)*0.3; //2.0 is currently Model::getMaxJoint().d.x so min() does not limit the range
-                length = min(length, Model::getMaxJoint().d.x); break;
+                length = std::min(length, Model::getMaxJoint().d.x); break;
 #endif
         case 'l': length += (0.33 - length)*0.3;
-                length = max(length, Model::getMinJoint().d.x); break;
+                length = std::max(length, Model::getMinJoint().d.x); break;
 
         case 'W': weight += (2.0 - weight)*0.3;  break;