Changeset 3262 for code/branches/core4/src/core/Executor.h

Timestamp:

Jul 1, 2009, 10:04:54 AM (16 years ago)

Author:

rgrieder

Message:

Replaced orxonox::min and orxonox::max with std version (which do exactly the same).
The std version are in the <algorithm> header.

File:

• code/branches/core4/src/core/Executor.h (modified) (2 diffs)

code/branches/core4/src/core/Executor.h

@@ -32 +32 @@
 
 #include "CorePrereqs.h"
+
+#include <algorithm>
+#include <string>
 
 #include "util/Debug.h"
@@ -101 +104 @@
             COUT(5) << tokens[i]; \
         } \
-        COUT(5) << ") and " << max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \
+        COUT(5) << ") and " << std::max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \
         for (unsigned int i = tokens.size(); i < paramCount; i++) \
         { \