[colobot] 125/377: Moving macro MAX from CBot.h to CBotTwoOpExpr.cpp.

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 51f0675e413c9fbdd1c12dcfc1956c92285c3f60
Author: Grunaka <dev at romainbreton.fr>
Date:   Sun Nov 22 14:36:50 2015 +0100

    Moving macro MAX from CBot.h to CBotTwoOpExpr.cpp.
---
 src/CBot/CBot.h                      | 2 --
 src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 0b619fe..a732d7a 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -54,8 +54,6 @@ class CBotDefParam; // paramerer list of a function
 
 extern bool SaveVar(FILE* pf, CBotVar* pVar);
 
-#define    MAX(a,b)    ((a>b) ? a : b)
-
 extern CBotInstr* CompileParams(CBotToken* &p, CBotCStack* pStack, CBotVar** ppVars);
 
 extern bool TypeCompatible( CBotTypResult& type1, CBotTypResult& type2, int op = 0 );
diff --git a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
index ab5bc65..6a7477f 100644
--- a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
+++ b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp
@@ -33,6 +33,8 @@
 // Global include
 #include <cassert>
 
+#define    MAX(a,b)    ((a>b) ? a : b)
+
 ////////////////////////////////////////////////////////////////////////////////
 CBotTwoOpExpr::CBotTwoOpExpr()
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git