diff options
Diffstat (limited to 'lib/common')
| -rw-r--r-- | lib/common/Box.h | 2 | ||||
| -rw-r--r-- | lib/common/DebugAssertFailed.cpp | 4 | ||||
| -rw-r--r-- | lib/common/DebugMemLeakFinder.cpp | 4 | ||||
| -rw-r--r-- | lib/common/DebugPrintf.cpp | 4 | ||||
| -rw-r--r-- | lib/common/FdGetLine.h | 2 | ||||
| -rw-r--r-- | lib/common/IOStreamGetLine.h | 2 | ||||
| -rw-r--r-- | lib/common/Timer.cpp | 10 | ||||
| -rw-r--r-- | lib/common/Utils.cpp | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/lib/common/Box.h b/lib/common/Box.h index 6b50ade1..1124a062 100644 --- a/lib/common/Box.h +++ b/lib/common/Box.h @@ -37,7 +37,7 @@ #include "CommonException.h" #include "Logging.h" -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD extern bool AssertFailuresToSyslog; #define ASSERT_FAILS_TO_SYSLOG_ON {AssertFailuresToSyslog = true;} diff --git a/lib/common/DebugAssertFailed.cpp b/lib/common/DebugAssertFailed.cpp index cceab0ef..e498d641 100644 --- a/lib/common/DebugAssertFailed.cpp +++ b/lib/common/DebugAssertFailed.cpp @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------- -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD #include "Box.h" @@ -33,5 +33,5 @@ void BoxDebugAssertFailed(const char *cond, const char *file, int line) } -#endif // NDEBUG +#endif // BOX_RELEASE_BUILD diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp index 90372a72..230d7163 100644 --- a/lib/common/DebugMemLeakFinder.cpp +++ b/lib/common/DebugMemLeakFinder.cpp @@ -8,7 +8,7 @@ // -------------------------------------------------------------------------- -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD #include "Box.h" @@ -548,4 +548,4 @@ void operator delete(void *ptr) throw () internal_delete(ptr); } -#endif // NDEBUG +#endif // BOX_RELEASE_BUILD diff --git a/lib/common/DebugPrintf.cpp b/lib/common/DebugPrintf.cpp index 8d75f458..1335d473 100644 --- a/lib/common/DebugPrintf.cpp +++ b/lib/common/DebugPrintf.cpp @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------- -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD #include "Box.h" @@ -80,4 +80,4 @@ int BoxDebugTrace(const char *format, ...) } -#endif // NDEBUG +#endif // BOX_RELEASE_BUILD diff --git a/lib/common/FdGetLine.h b/lib/common/FdGetLine.h index a18007a3..df43c3c9 100644 --- a/lib/common/FdGetLine.h +++ b/lib/common/FdGetLine.h @@ -12,7 +12,7 @@ #include <string> -#ifdef NDEBUG +#ifdef BOX_RELEASE_BUILD #define FDGETLINE_BUFFER_SIZE 1024 #elif defined WIN32 // need enough space for at least one unicode character diff --git a/lib/common/IOStreamGetLine.h b/lib/common/IOStreamGetLine.h index cf152e5a..9a5d1818 100644 --- a/lib/common/IOStreamGetLine.h +++ b/lib/common/IOStreamGetLine.h @@ -14,7 +14,7 @@ #include "IOStream.h" -#ifdef NDEBUG +#ifdef BOX_RELEASE_BUILD #define IOSTREAMGETLINE_BUFFER_SIZE 1024 #else #define IOSTREAMGETLINE_BUFFER_SIZE 4 diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp index b4629ed2..cac86512 100644 --- a/lib/common/Timer.cpp +++ b/lib/common/Timer.cpp @@ -347,7 +347,7 @@ Timer::Timer(size_t timeoutSecs, const std::string& rName) , mTimerHandle(INVALID_HANDLE_VALUE) #endif { - #ifndef NDEBUG + #ifndef BOX_RELEASE_BUILD if (timeoutSecs == 0) { BOX_TRACE(TIMER_ID "initialised for " << timeoutSecs << @@ -476,7 +476,7 @@ void Timer::Stop() Timer::~Timer() { - #ifndef NDEBUG + #ifndef BOX_RELEASE_BUILD BOX_TRACE(TIMER_ID "destroyed"); #endif @@ -503,7 +503,7 @@ Timer::Timer(const Timer& rToCopy) , mTimerHandle(INVALID_HANDLE_VALUE) #endif { - #ifndef NDEBUG + #ifndef BOX_RELEASE_BUILD if (mExpired) { BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", " @@ -544,7 +544,7 @@ Timer::Timer(const Timer& rToCopy) Timer& Timer::operator=(const Timer& rToCopy) { - #ifndef NDEBUG + #ifndef BOX_RELEASE_BUILD if (rToCopy.mExpired) { BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", " @@ -595,7 +595,7 @@ Timer& Timer::operator=(const Timer& rToCopy) void Timer::OnExpire() { - #ifndef NDEBUG + #ifndef BOX_RELEASE_BUILD BOX_TRACE(TIMER_ID "fired"); #endif diff --git a/lib/common/Utils.cpp b/lib/common/Utils.cpp index c259edeb..408eaa57 100644 --- a/lib/common/Utils.cpp +++ b/lib/common/Utils.cpp @@ -58,7 +58,7 @@ void SplitString(const std::string &String, char SplitOn, std::vector<std::strin { rOutput.push_back(String.substr(b)); } -/*#ifndef NDEBUG +/*#ifndef BOX_RELEASE_BUILD BOX_TRACE("Splitting string '" << String << " on " << (char)SplitOn); for(unsigned int l = 0; l < rOutput.size(); ++l) { |