Changeset 1130 for cpp/common/log.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/common/log.cpp (modified) (3 diffs)

cpp/common/log.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include "Convert.h"
 #include <assert.h>
+#include <algorithm>
 
 const char* LOG_LEVEL_ARRAY[] = { "[DEBUG] ", "", "[WARN] ", "[ERROR] ", "[CRITICAL] " };
@@ -36 +37 @@
 {
         assert((level>=LOG_MIN) && (level<=LOG_MAX));
-        level = min(LOG_MAX, max(LOG_MIN, level));
+        level = std::min(LOG_MAX, std::max(LOG_MIN, level));
         return LOG_LEVEL_ARRAY[level + 1];
 }