[Box Backup-commit] COMMIT r2415 - in box/trunk: bin/bbackupctl bin/bbackupd bin/bbackupquery bin/bbstored infrastructure infrastructure/msvc/2003 infrastructure/msvc/2005 lib/backupclient lib/backupstore lib/common lib/compress lib/raidfile lib/server test/backupdiff test/common
boxbackup-dev@boxbackup.org
boxbackup-dev@boxbackup.org
Tue, 30 Dec 2008 14:54:57 +0000 (GMT)
Author: chris
Date: 2008-12-30 14:54:55 +0000 (Tue, 30 Dec 2008)
New Revision: 2415
Modified:
box/trunk/bin/bbackupctl/bbackupctl.cpp
box/trunk/bin/bbackupd/BackupDaemon.cpp
box/trunk/bin/bbackupquery/bbackupquery.cpp
box/trunk/bin/bbstored/BackupStoreContext.cpp
box/trunk/infrastructure/buildenv-testmain-template.cpp
box/trunk/infrastructure/makebuildenv.pl.in
box/trunk/infrastructure/msvc/2003/bbackupctl.vcproj
box/trunk/infrastructure/msvc/2003/bbackupd.vcproj
box/trunk/infrastructure/msvc/2003/boxquery.vcproj
box/trunk/infrastructure/msvc/2003/common.vcproj
box/trunk/infrastructure/msvc/2003/win32test.vcproj
box/trunk/infrastructure/msvc/2005/bbackupctl.vcproj
box/trunk/infrastructure/msvc/2005/bbackupd.vcproj
box/trunk/infrastructure/msvc/2005/boxquery.vcproj
box/trunk/infrastructure/msvc/2005/common.vcproj
box/trunk/infrastructure/msvc/2005/win32test.vcproj
box/trunk/lib/backupclient/BackupStoreFile.h
box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
box/trunk/lib/backupclient/BackupStoreFileEncodeStream.cpp
box/trunk/lib/backupstore/BackupStoreCheck.h
box/trunk/lib/backupstore/BackupStoreCheckData.cpp
box/trunk/lib/backupstore/BackupStoreInfo.cpp
box/trunk/lib/backupstore/StoreStructure.h
box/trunk/lib/common/Box.h
box/trunk/lib/common/DebugAssertFailed.cpp
box/trunk/lib/common/DebugMemLeakFinder.cpp
box/trunk/lib/common/DebugPrintf.cpp
box/trunk/lib/common/FdGetLine.h
box/trunk/lib/common/IOStreamGetLine.h
box/trunk/lib/common/Timer.cpp
box/trunk/lib/common/Utils.cpp
box/trunk/lib/compress/CompressStream.cpp
box/trunk/lib/raidfile/RaidFileUtil.cpp
box/trunk/lib/raidfile/RaidFileWrite.cpp
box/trunk/lib/server/Daemon.cpp
box/trunk/lib/server/Protocol.cpp
box/trunk/lib/server/SSLLib.cpp
box/trunk/lib/server/SSLLib.h
box/trunk/lib/server/ServerStream.h
box/trunk/lib/server/SocketStreamTLS.cpp
box/trunk/test/backupdiff/testbackupdiff.cpp
box/trunk/test/common/testcommon.cpp
Log:
Rename NDEBUG flag to BOX_RELEASE_BUILD, as other projects use NDEBUG as
well (e.g. wxWidgets) and it causes conflicts which are difficult to
resolve.
Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -356,7 +356,7 @@
MAINHELPER_END
-#if defined WIN32 && ! defined NDEBUG
+#if defined WIN32 && ! defined BOX_RELEASE_BUILD
closelog();
#endif
Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -1522,12 +1522,12 @@
#endif // HAVE_STRUCT_MNTENT_MNT_DIR
// Check sorting and that things are as we expect
ASSERT(mountPoints.size() > 0);
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
{
std::set<std::string, mntLenCompare>::reverse_iterator i(mountPoints.rbegin());
ASSERT(*i == "/");
}
-#endif // n NDEBUG
+#endif // n BOX_RELEASE_BUILD
#endif // n HAVE_STRUCT_STATFS_F_MNTONNAME || n HAVE_STRUCT_STATVFS_F_MNTONNAME
#endif // HAVE_MOUNTS
Modified: box/trunk/bin/bbackupquery/bbackupquery.cpp
===================================================================
--- box/trunk/bin/bbackupquery/bbackupquery.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/bin/bbackupquery/bbackupquery.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -94,7 +94,7 @@
#endif
// Really don't want trace statements happening, even in debug mode
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
BoxDebugTraceOn = false;
#endif
@@ -114,7 +114,7 @@
Logging::SetProgramName("bbackupquery");
- #ifdef NDEBUG
+ #ifdef BOX_RELEASE_BUILD
int masterLevel = Log::NOTICE; // need an int to do math with
#else
int masterLevel = Log::INFO; // need an int to do math with
Modified: box/trunk/bin/bbstored/BackupStoreContext.cpp
===================================================================
--- box/trunk/bin/bbstored/BackupStoreContext.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/bin/bbstored/BackupStoreContext.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -33,7 +33,7 @@
// Maximum number of directories to keep in the cache
// When the cache is bigger than this, everything gets
// deleted.
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define MAX_CACHE_SIZE 32
#else
#define MAX_CACHE_SIZE 2
Modified: box/trunk/infrastructure/buildenv-testmain-template.cpp
===================================================================
--- box/trunk/infrastructure/buildenv-testmain-template.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/buildenv-testmain-template.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -43,7 +43,7 @@
int test(int argc, const char *argv[]);
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define MODE_TEXT "release"
#else
#define MODE_TEXT "debug"
@@ -167,7 +167,7 @@
Logging::SetProgramName(BOX_MODULE);
#ifdef HAVE_GETOPT_H
- #ifdef NDEBUG
+ #ifdef BOX_RELEASE_BUILD
int logLevel = Log::NOTICE; // need an int to do math with
#else
int logLevel = Log::INFO; // need an int to do math with
Modified: box/trunk/infrastructure/makebuildenv.pl.in
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl.in 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/makebuildenv.pl.in 2008-12-30 14:54:55 UTC (rev 2415)
@@ -457,7 +457,6 @@
if (-d "$module/testfiles")
{
print TESTFILE <<__E;
-echo Killing any running daemons...
kill_process bbackupd
kill_process bbstored
__E
@@ -560,7 +559,7 @@
LDFLAGS = @LDFLAGS@ @LDADD_RDYNAMIC@
.ifdef RELEASE
-CXXFLAGS = -DNDEBUG $release_flags \$(DEFAULT_CXXFLAGS)
+CXXFLAGS = -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS)
OUTBASE = ../../release
OUTDIR = ../../release/$mod
DEPENDMAKEFLAGS = -D RELEASE
Modified: box/trunk/infrastructure/msvc/2003/bbackupctl.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2003/bbackupctl.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2003/bbackupctl.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -72,7 +72,7 @@
EnableFiberSafeOptimizations="TRUE"
OptimizeForProcessor="1"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2003/bbackupd.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2003/bbackupd.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2003/bbackupd.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(SolutionDir)..\..\..\..\boost_1_31_0";"$(SolutionDir)..\..\..\..\openssl\include";"$(SolutionDir)..\..\..\..\zlib\include";"$(SolutionDir)..\..\..\lib\backupclient";"$(SolutionDir)..\..\..\lib\server";"$(SolutionDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\lib\compress";"$(SolutionDir)..\..\..\lib\win32";"$(SolutionDir)..\..\..\lib\common\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "
+ PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -73,7 +73,7 @@
EnableFiberSafeOptimizations="TRUE"
OptimizeForProcessor="1"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2003/boxquery.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2003/boxquery.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2003/boxquery.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -21,7 +21,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "
+ PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -73,7 +73,7 @@
EnableFiberSafeOptimizations="TRUE"
OptimizeForProcessor="1"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOOST_REGEX_NO_LIB"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2003/common.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2003/common.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2003/common.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "
+ PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;BOX_RELEASE_BUILD "
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -64,7 +64,7 @@
EnableFiberSafeOptimizations="TRUE"
OptimizeForProcessor="1"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\";"$(SolutionDir)..\..\..\..\boost_1_31_0\""
- PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;NDEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"
+ PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2003/win32test.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2003/win32test.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2003/win32test.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -72,7 +72,7 @@
EnableFiberSafeOptimizations="TRUE"
OptimizeForProcessor="1"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2005/bbackupctl.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2005/bbackupctl.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2005/bbackupctl.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -123,7 +123,7 @@
Name="VCCLCompilerTool"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2005/bbackupd.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2005/bbackupd.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2005/bbackupd.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -124,7 +124,7 @@
Name="VCCLCompilerTool"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(SolutionDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2005/boxquery.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2005/boxquery.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2005/boxquery.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -123,7 +123,7 @@
Name="VCCLCompilerTool"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;PCRE_STATIC"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2005/common.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2005/common.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2005/common.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -111,7 +111,7 @@
Name="VCCLCompilerTool"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common\";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\..\pcre\pcre-6.7\""
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
Modified: box/trunk/infrastructure/msvc/2005/win32test.vcproj
===================================================================
--- box/trunk/infrastructure/msvc/2005/win32test.vcproj 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/infrastructure/msvc/2005/win32test.vcproj 2008-12-30 14:54:55 UTC (rev 2415)
@@ -123,7 +123,7 @@
Name="VCCLCompilerTool"
EnableFiberSafeOptimizations="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\bin\bbackupd";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\common\";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\..\openssl\inc32";"$(ProjectDir)..\..\..\..\zlib\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
+ PreprocessorDefinitions="WIN32;BOX_RELEASE_BUILD;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;_CRT_SECURE_NO_DEPRECATE;PCRE_STATIC"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
Modified: box/trunk/lib/backupclient/BackupStoreFile.h
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFile.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupclient/BackupStoreFile.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -215,7 +215,7 @@
static BackupStoreFileStats msStats;
// For debug
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
static bool TraceDetailsOfDiffProcess;
#endif
Modified: box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFileDiff.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupclient/BackupStoreFileDiff.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -40,7 +40,7 @@
// By default, don't trace out details of the diff as we go along -- would fill up logs significantly.
// But it's useful for the test.
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
bool BackupStoreFile::TraceDetailsOfDiffProcess = false;
#endif
@@ -436,7 +436,7 @@
}
// trace the size table in debug builds
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
if(BackupStoreFile::TraceDetailsOfDiffProcess)
{
for(int t = 0; t < BACKUP_FILE_DIFF_MAX_BLOCK_SIZES; ++t)
@@ -728,7 +728,7 @@
throw;
}
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
if(BackupStoreFile::TraceDetailsOfDiffProcess)
{
// Trace out the found blocks in debug mode
@@ -810,7 +810,7 @@
ASSERT(pFirstInHashList != 0);
ASSERT(pIndex != 0);
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
uint16_t DEBUG_Hash = fastSum.GetComponentForHashing();
#endif
uint32_t Checksum = fastSum.GetChecksum();
@@ -916,7 +916,7 @@
instruction.mSpaceBefore = SizeOfInputFile;
rRecipe.push_back(instruction);
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
if(BackupStoreFile::TraceDetailsOfDiffProcess)
{
BOX_TRACE("Diff: Default recipe generated, " <<
@@ -936,7 +936,7 @@
ASSERT(i != rFoundBlocks.end()); // check logic
// Counting for debug tracing
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
int64_t debug_NewBytesFound = 0;
int64_t debug_OldBlocksUsed = 0;
#endif
@@ -963,7 +963,7 @@
instruction.mSpaceBefore = i->first - loc;
// Move location forward to match
loc += instruction.mSpaceBefore;
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
debug_NewBytesFound += instruction.mSpaceBefore;
#endif
}
@@ -989,7 +989,7 @@
instruction.mBlocks += 1;
}
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
debug_OldBlocksUsed++;
#endif
@@ -1005,14 +1005,14 @@
{
RESET_INSTRUCTION
instruction.mSpaceBefore = SizeOfInputFile - loc;
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
debug_NewBytesFound += instruction.mSpaceBefore;
#endif
rRecipe.push_back(instruction);
}
// dump out the recipe
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
BOX_TRACE("Diff: " <<
debug_NewBytesFound << " new bytes found, " <<
debug_OldBlocksUsed << " old blocks used");
Modified: box/trunk/lib/backupclient/BackupStoreFileEncodeStream.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFileEncodeStream.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupclient/BackupStoreFileEncodeStream.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -236,7 +236,7 @@
{
throw std::bad_alloc();
}
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
// In debug builds, make sure that the reallocation code is exercised.
mEncodedBuffer.Allocate(mAllocatedBufferSize / 4);
#else
Modified: box/trunk/lib/backupstore/BackupStoreCheck.h
===================================================================
--- box/trunk/lib/backupstore/BackupStoreCheck.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupstore/BackupStoreCheck.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -48,7 +48,7 @@
// Size of blocks in the list of IDs
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define BACKUPSTORECHECK_BLOCK_SIZE (64*1024)
#else
#define BACKUPSTORECHECK_BLOCK_SIZE 8
@@ -150,7 +150,7 @@
return (pBlock->mFlags[Index / Flags__NumItemsPerEntry] >> ((Index % Flags__NumItemsPerEntry) * Flags__NumFlags)) & Flags__MASK;
}
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
void DumpObjectInfo();
#define DUMP_OBJECT_INFO DumpObjectInfo();
#else
Modified: box/trunk/lib/backupstore/BackupStoreCheckData.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreCheckData.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupstore/BackupStoreCheckData.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -174,7 +174,7 @@
}
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
// --------------------------------------------------------------------------
//
// Function
Modified: box/trunk/lib/backupstore/BackupStoreInfo.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreInfo.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupstore/BackupStoreInfo.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -55,7 +55,7 @@
END_STRUCTURE_PACKING_FOR_WIRE
#endif
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define NUM_DELETED_DIRS_BLOCK 256
#else
#define NUM_DELETED_DIRS_BLOCK 2
Modified: box/trunk/lib/backupstore/StoreStructure.h
===================================================================
--- box/trunk/lib/backupstore/StoreStructure.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/backupstore/StoreStructure.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -12,7 +12,7 @@
#include <string>
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define STORE_ID_SEGMENT_LENGTH 8
#define STORE_ID_SEGMENT_MASK 0xff
#else
Modified: box/trunk/lib/common/Box.h
===================================================================
--- box/trunk/lib/common/Box.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/Box.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -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;}
Modified: box/trunk/lib/common/DebugAssertFailed.cpp
===================================================================
--- box/trunk/lib/common/DebugAssertFailed.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/DebugAssertFailed.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
#include "Box.h"
@@ -33,5 +33,5 @@
}
-#endif // NDEBUG
+#endif // BOX_RELEASE_BUILD
Modified: box/trunk/lib/common/DebugMemLeakFinder.cpp
===================================================================
--- box/trunk/lib/common/DebugMemLeakFinder.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/DebugMemLeakFinder.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -8,7 +8,7 @@
// --------------------------------------------------------------------------
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
#include "Box.h"
@@ -548,4 +548,4 @@
internal_delete(ptr);
}
-#endif // NDEBUG
+#endif // BOX_RELEASE_BUILD
Modified: box/trunk/lib/common/DebugPrintf.cpp
===================================================================
--- box/trunk/lib/common/DebugPrintf.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/DebugPrintf.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -7,7 +7,7 @@
//
// --------------------------------------------------------------------------
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
#include "Box.h"
@@ -80,4 +80,4 @@
}
-#endif // NDEBUG
+#endif // BOX_RELEASE_BUILD
Modified: box/trunk/lib/common/FdGetLine.h
===================================================================
--- box/trunk/lib/common/FdGetLine.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/FdGetLine.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -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
Modified: box/trunk/lib/common/IOStreamGetLine.h
===================================================================
--- box/trunk/lib/common/IOStreamGetLine.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/IOStreamGetLine.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -14,7 +14,7 @@
#include "IOStream.h"
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define IOSTREAMGETLINE_BUFFER_SIZE 1024
#else
#define IOSTREAMGETLINE_BUFFER_SIZE 4
Modified: box/trunk/lib/common/Timer.cpp
===================================================================
--- box/trunk/lib/common/Timer.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/Timer.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -347,7 +347,7 @@
, 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 @@
Timer::~Timer()
{
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
BOX_TRACE(TIMER_ID "destroyed");
#endif
@@ -503,7 +503,7 @@
, 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::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 @@
void Timer::OnExpire()
{
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
BOX_TRACE(TIMER_ID "fired");
#endif
Modified: box/trunk/lib/common/Utils.cpp
===================================================================
--- box/trunk/lib/common/Utils.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/common/Utils.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -58,7 +58,7 @@
{
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)
{
Modified: box/trunk/lib/compress/CompressStream.cpp
===================================================================
--- box/trunk/lib/compress/CompressStream.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/compress/CompressStream.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -19,7 +19,7 @@
#include "MemLeakFindOn.h"
// How big a buffer to use
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
// debug!
#define BUFFER_SIZE 256
#else
Modified: box/trunk/lib/raidfile/RaidFileUtil.cpp
===================================================================
--- box/trunk/lib/raidfile/RaidFileUtil.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/raidfile/RaidFileUtil.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -58,7 +58,7 @@
if(pRevisionID != 0)
{
(*pRevisionID) = FileModificationTime(st);
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
// The resolution of timestamps may be very
// low, e.g. 1 second. So add the size to it
// to give a bit more chance of it changing.
@@ -107,7 +107,7 @@
if(pRevisionID != 0)
{
(*pRevisionID) = revisionID;
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
// The resolution of timestamps may be very low, e.g.
// 1 second. So add the size to it to give a bit more
// chance of it changing.
Modified: box/trunk/lib/raidfile/RaidFileWrite.cpp
===================================================================
--- box/trunk/lib/raidfile/RaidFileWrite.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/raidfile/RaidFileWrite.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -390,7 +390,7 @@
// // DEBUG MODE -- check file system size block size is same as block size for files
// // doesn't really apply, as space benefits of using fragment size are worth efficiency,
// // and anyway, it'll be buffered eventually so it won't matter.
-// #ifndef NDEBUG
+// #ifndef BOX_RELEASE_BUILD
// {
// if(writeFileStat.st_blksize != blockSize)
// {
Modified: box/trunk/lib/server/Daemon.cpp
===================================================================
--- box/trunk/lib/server/Daemon.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/Daemon.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -296,7 +296,7 @@
mConfigFileName = DefaultConfigFile;
mAppName = argv[0];
- #ifdef NDEBUG
+ #ifdef BOX_RELEASE_BUILD
mLogLevel = Log::NOTICE; // need an int to do math with
#else
mLogLevel = Log::INFO; // need an int to do math with
Modified: box/trunk/lib/server/Protocol.cpp
===================================================================
--- box/trunk/lib/server/Protocol.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/Protocol.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -26,7 +26,7 @@
#include "MemLeakFindOn.h"
-#ifdef NDEBUG
+#ifdef BOX_RELEASE_BUILD
#define PROTOCOL_ALLOCATE_SEND_BLOCK_CHUNK 1024
#else
// #define PROTOCOL_ALLOCATE_SEND_BLOCK_CHUNK 1024
Modified: box/trunk/lib/server/SSLLib.cpp
===================================================================
--- box/trunk/lib/server/SSLLib.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/SSLLib.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -23,7 +23,7 @@
#include "MemLeakFindOn.h"
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
bool SSLLib__TraceErrors = false;
#endif
Modified: box/trunk/lib/server/SSLLib.h
===================================================================
--- box/trunk/lib/server/SSLLib.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/SSLLib.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -10,7 +10,7 @@
#ifndef SSLLIB__H
#define SSLLIB__H
-#ifndef NDEBUG
+#ifndef BOX_RELEASE_BUILD
extern bool SSLLib__TraceErrors;
#define SET_DEBUG_SSLLIB_TRACE_ERRORS {SSLLib__TraceErrors = true;}
#else
Modified: box/trunk/lib/server/ServerStream.h
===================================================================
--- box/trunk/lib/server/ServerStream.h 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/ServerStream.h 2008-12-30 14:54:55 UTC (rev 2415)
@@ -108,7 +108,7 @@
{
// Child task, dump leaks to trace, which we make sure is on
#ifdef BOX_MEMORY_LEAK_TESTING
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
TRACE_TO_SYSLOG(true);
TRACE_TO_STDOUT(true);
#endif
Modified: box/trunk/lib/server/SocketStreamTLS.cpp
===================================================================
--- box/trunk/lib/server/SocketStreamTLS.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/lib/server/SocketStreamTLS.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -391,7 +391,7 @@
case SSL_ERROR_WANT_WRITE:
// wait for the requried data
{
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
bool conditionmet =
#endif
WaitWhenRetryRequired(se, IOStream::TimeOutInfinite);
Modified: box/trunk/test/backupdiff/testbackupdiff.cpp
===================================================================
--- box/trunk/test/backupdiff/testbackupdiff.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/test/backupdiff/testbackupdiff.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -388,7 +388,7 @@
int test(int argc, const char *argv[])
{
// Want to trace out all the details
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
#ifndef WIN32
BackupStoreFile::TraceDetailsOfDiffProcess = true;
#endif
Modified: box/trunk/test/common/testcommon.cpp
===================================================================
--- box/trunk/test/common/testcommon.cpp 2008-12-30 14:34:00 UTC (rev 2414)
+++ box/trunk/test/common/testcommon.cpp 2008-12-30 14:54:55 UTC (rev 2415)
@@ -298,7 +298,7 @@
// Check that using timer methods without initialisation
// throws an assertion failure. Can only do this in debug mode
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
TEST_CHECK_THROWS(Timers::Add(*(Timer*)NULL),
CommonException, AssertFailed);
TEST_CHECK_THROWS(Timers::Remove(*(Timer*)NULL),
@@ -306,7 +306,7 @@
#endif
// TEST_CHECK_THROWS(Timers::Signal(), CommonException, AssertFailed);
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
TEST_CHECK_THROWS(Timers::Cleanup(), CommonException,
AssertFailed);
#endif
@@ -315,7 +315,7 @@
Timers::Init();
// Check that double initialisation throws an exception
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
TEST_CHECK_THROWS(Timers::Init(), CommonException,
AssertFailed);
#endif
@@ -324,7 +324,7 @@
Timers::Cleanup();
// Check that double cleanup throws an exception
- #ifndef NDEBUG
+ #ifndef BOX_RELEASE_BUILD
TEST_CHECK_THROWS(Timers::Cleanup(), CommonException,
AssertFailed);
#endif