Changeset 1130 for cpp/frams/vm

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/vm/classes/collectionobj.cpp (modified) (3 diffs)

cpp/frams/vm/classes/collectionobj.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 <common/nonstd_math.h> //sqrt in borland
 #include <frams/util/validitychecks.h>
-#include <common/nonstd_stl.h>
+#include <algorithm>
 #include <frams/util/sstringutils.h>
 #ifndef NO_VMACHINE
@@ -228 +228 @@
                 s += d * d;
         }
-        ret->setDouble(sqrt(s / max(1, data.size() - 1)));
+        ret->setDouble(sqrt(s / std::max(1, data.size() - 1)));
 }