mirror of
https://github.com/KjellKod/g3log.git
synced 2024-12-12 10:23:50 +01:00
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:
commit
570a85b997
@ -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;
|
||||
|
@ -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__))
|
||||
|
@ -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
|
||||
|
@ -135,6 +135,9 @@ private:
|
||||
};
|
||||
} // testing_helpers
|
||||
|
||||
|
||||
#ifdef CHANGE_G3LOG_DEBUG_TO_DBUG
|
||||
#undef DEBUG
|
||||
#define DEBUG DBUG
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user