Modified MAX to play nice with GLib's MAX

This commit is contained in:
Joel Holdsworth 2008-12-06 14:47:00 +00:00
parent d75261ea23
commit b2ffa116f5

View file

@ -238,7 +238,8 @@ namespace util
#define INSTANCEOF(CLASS, EXPR) (dynamic_cast<const CLASS*> (EXPR))
/** the inevitalbe MAX macro, sometimes still necessary in template code */
#define MAX(A,B) (A < B) ? (B) : (A)
#ifndef MAX // this is present to make this definition play nice with GLib
#define MAX(A,B) ((A < B) ? (B) : (A))
#endif
#endif /*UTIL_HPP_*/