Changeset 1130 for cpp/common/loggers

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/common/loggers

Files:

• loggers.h (modified) (2 diffs)
• loggertostdout.cpp (modified) (2 diffs)

cpp/common/loggers/loggers.h

@@ -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.
 
@@ -9 +9 @@
 #include <common/threads.h>
 #include <common/nonstd_stl.h>
+#include <algorithm>
 
 class LoggerBase;

cpp/common/loggers/loggertostdout.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.
 
 #include "loggertostdout.h"
 #include <common/console.h>
+#include <algorithm>
 #include <assert.h>
 #ifdef SHP
@@ -38 +39 @@
         {
                 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));
                 printf(log_format, log_level[level + 1], obj, method, msg, "\n");
         }