diff options
| author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-02-10 02:04:17 +0300 |
|---|---|---|
| committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-02-10 02:04:17 +0300 |
| commit | 8ed69fb56a1f8e38faddd3a9c9d37d17350f7541 (patch) | |
| tree | 3e5db712e1b7033b13f21bfc03c543fdc9b4a97b /moses/Util.h | |
| parent | af9359e287f86d370da556d1279eb9d741b03ce8 (diff) | |
Some #defines were redefines when using IRSTLM. Now #undef-ing them prior to redefining them to avoid compiler warnings.
Diffstat (limited to 'moses/Util.h')
| -rw-r--r-- | moses/Util.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/moses/Util.h b/moses/Util.h index beefa53da..48e6a51ae 100644 --- a/moses/Util.h +++ b/moses/Util.h @@ -48,6 +48,11 @@ namespace Moses * when compiling for a gui front-end so that running gui won't generate * output on command line * */ + +// TRACE_ERR might have been defined by IRSTLM +#ifdef TRACE_ERR +#undef TRACE_ERR +#endif #ifdef TRACE_ENABLE #define TRACE_ERR(str) do { std::cerr << str; } while (false) #else @@ -57,7 +62,16 @@ namespace Moses /** verbose macros * */ +// VERBOSE might have been defined by IRSTLM +#ifdef VERBOSE +#undef VERBOSE +#endif #define VERBOSE(level,str) { IFVERBOSE(level) { TRACE_ERR(str); } } + +// VERBOSE might have been defined by IRSTLM +#ifdef IFVERBOSE +#undef IFVERBOSE +#endif #define IFVERBOSE(level) if (StaticData::Instance().GetVerboseLevel() >= level) #define XVERBOSE(level,str) VERBOSE(level, "[" << HERE << "] " << str) #define HERE __FILE__ << ":" << __LINE__ |