Changeset 1130 for cpp/frams/param

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

Location:

cpp/frams/param

Files:

• mutableparam.cpp (modified) (2 diffs)
• paramobj.cpp (modified) (2 diffs)

cpp/frams/param/mutableparam.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.
 
@@ -22 +22 @@
 };
 #undef FIELDSTRUCT
-const int MutableParam::staticprops = ARRAY_LENGTH(pe_tab);
+const int MutableParam::staticprops = std::size(pe_tab);
 
 MutableParam::MutableParam(const char*n, const char*g, int gr0)

cpp/frams/param/paramobj.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.
 
 #include <frams/param/paramobj.h>
 #include <frams/util/extvalue.h>
-#include <common/nonstd_stl.h>
+#include <algorithm>
         
 static const char* maybedup(bool dup, const char* src)
@@ -232 +232 @@
         const ExtValue *s = &src.fields[0];
         ExtValue *d = &fields[0];
-        int n = min(numfields, src.numfields);
+        int n = std::min(numfields, src.numfields);
         for (int i = 0; i < n; i++, d++, s++)
                 *d = *s;