diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-12-30 14:54:55 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-12-30 14:54:55 +0000 |
commit | f5a529cfd4a9f1920c0b1d75375258dab2d71be1 (patch) | |
tree | 83028df92c92eae6557bf6bfecb943a8ca9c8df9 /bin | |
parent | a5400afe73492cbb8e0049a7facb2b32f0fcad04 (diff) |
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.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 2 | ||||
-rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 4 | ||||
-rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 4 | ||||
-rw-r--r-- | bin/bbstored/BackupStoreContext.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index f55c689c..0340f400 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -356,7 +356,7 @@ int main(int argc, const char *argv[]) MAINHELPER_END -#if defined WIN32 && ! defined NDEBUG +#if defined WIN32 && ! defined BOX_RELEASE_BUILD closelog(); #endif diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index f192f763..7ddaba40 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -1522,12 +1522,12 @@ void BackupDaemon::SetupLocations(BackupClientContext &rClientContext, const Con #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 diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index 31c28046..bbe8dd14 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -94,7 +94,7 @@ int main(int argc, const char *argv[]) #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 @@ int main(int argc, const char *argv[]) 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 diff --git a/bin/bbstored/BackupStoreContext.cpp b/bin/bbstored/BackupStoreContext.cpp index f8108beb..990be05d 100644 --- a/bin/bbstored/BackupStoreContext.cpp +++ b/bin/bbstored/BackupStoreContext.cpp @@ -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 |