From 8fe68c5fc3a71fa17cf309f9b87b5089ecce8996 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 11 Mar 2012 05:27:13 -0500 Subject: [PATCH] Guarded against unreachable code warnings --- src/main.cc | 5 ++++- src/utils.cc | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cc b/src/main.cc index e341b526..dc0798e3 100644 --- a/src/main.cc +++ b/src/main.cc @@ -201,6 +201,7 @@ int main(int argc, char * argv[], char * envp[]) // up everything by closing the session and deleting the session object, and // then shutting down the memory tracing subsystem. Otherwise, let it all // leak because we're about to exit anyway. +#if defined(VERIFY_ON) IF_VERIFY() { checked_delete(global_scope); @@ -208,7 +209,9 @@ int main(int argc, char * argv[], char * envp[]) #if defined(VERIFY_ON) shutdown_memory_tracing(); #endif - } else { + } else +#endif + { INFO("Ledger ended"); // let global_scope leak! } diff --git a/src/utils.cc b/src/utils.cc index eb1d8009..628fb158 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -553,9 +553,6 @@ void logger_func(log_level_t level) #if defined(VERIFY_ON) IF_VERIFY() *_log_stream << " TIME OBJSZ MEMSZ" << std::endl; -#else - IF_VERIFY() - *_log_stream << " TIME" << std::endl; #endif }