Merge pull request #128 from AbberiorInstruments/DBUG-vs-DEBUG

Fix compilation errors when CHANGE_G3LOG_DEBUG_TO_DBUG is enabled-
This commit is contained in:
Kjell Hedström 2016-10-20 13:35:17 -06:00 committed by GitHub
commit 570a85b997
4 changed files with 19 additions and 1 deletions

View File

@ -30,6 +30,11 @@ namespace example_fatal
}
} // example fatal
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
int main(int argc, char **argv)
{
double pi_d = 3.1415926535897932384626433832795;

View File

@ -24,6 +24,11 @@
#define NOEXCEPT throw()
#endif
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
namespace
{
#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))

View File

@ -22,6 +22,11 @@ namespace
#endif
}
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif
namespace example_fatal
{
// on Ubunti this caused get a compiler warning with gcc4.6

View File

@ -135,6 +135,9 @@ private:
};
} // testing_helpers
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
#undef DEBUG
#define DEBUG DBUG
#endif