Changeset 1130 for cpp/frams/util/multirange.cpp

Timestamp:

04/16/21 15:55:34 (3 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/util/multirange.cpp (modified) (4 diffs)

cpp/frams/util/multirange.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "multirange.h"
-#include <common/nonstd_stl.h>
+#include <algorithm>
 
 #include <stdio.h>
@@ -230 +230 @@
                 break;
         case SAME + JOINBEGIN: // extend 1 range
-                setEnd(r1, max(getEnd(r2), end));
+                setEnd(r1, std::max(getEnd(r2), end));
                 break;
         case SAME + JOINEND: // extend 1 range
@@ -244 +244 @@
                 break;
         case JOINBEGIN: // extend r1
-                setEnd(r1, max(end, getEnd(r2)));
+                setEnd(r1, std::max(end, getEnd(r2)));
                 removeRanges(r1 + 1, r2);
                 break;
@@ -253 +253 @@
         case 0: // extend r2
                 setBegin(r2, begin);
-                setEnd(r2, max(end, getEnd(r2)));
+                setEnd(r2, std::max(end, getEnd(r2)));
                 removeRanges(r1 + 1, r2 - 1);
                 break;