diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/common/Box.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/common/Box.h')
| -rw-r--r-- | lib/common/Box.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/lib/common/Box.h b/lib/common/Box.h index 91b4967b..316f4364 100644 --- a/lib/common/Box.h +++ b/lib/common/Box.h @@ -17,11 +17,8 @@ #include "BoxPlatform.h" -<<<<<<< HEAD -======= #include <memory> ->>>>>>> 0.12 // uncomment this line to enable full memory leak finding on all // malloc-ed blocks (at least, ones used by the STL) //#define MEMLEAKFINDER_FULL_MALLOC_MONITORING @@ -43,10 +40,6 @@ #include "Logging.h" #ifndef BOX_RELEASE_BUILD -<<<<<<< HEAD - -======= ->>>>>>> 0.12 extern bool AssertFailuresToSyslog; #define ASSERT_FAILS_TO_SYSLOG_ON {AssertFailuresToSyslog = true;} void BoxDebugAssertFailed(const char *cond, const char *file, int line); @@ -77,10 +70,6 @@ // Exception names #define EXCEPTION_CODENAMES_EXTENDED -<<<<<<< HEAD - -======= ->>>>>>> 0.12 #else #define ASSERT_FAILS_TO_SYSLOG_ON #define ASSERT(cond) @@ -91,11 +80,6 @@ // Box Backup builds release get extra information for exception logging #define EXCEPTION_CODENAMES_EXTENDED #define EXCEPTION_CODENAMES_EXTENDED_WITH_DESCRIPTION -<<<<<<< HEAD - -#endif - -======= #endif #if defined DEBUG_LEAKS @@ -110,7 +94,6 @@ #endif #endif // DEBUG_LEAKS || BOX_RELEASE_BUILD ->>>>>>> 0.12 #ifdef BOX_MEMORY_LEAK_TESTING // Memory leak testing #include "MemLeakFinder.h" @@ -131,10 +114,6 @@ #define THROW_EXCEPTION(type, subtype) \ { \ -<<<<<<< HEAD - if(!HideExceptionMessageGuard::ExceptionsHidden()) \ - { \ -======= if((!HideExceptionMessageGuard::ExceptionsHidden() \ && !HideSpecificExceptionGuard::IsHidden( \ type::ExceptionType, type::subtype)) \ @@ -147,7 +126,6 @@ guard.reset(new Logging::Guard(Log::EVERYTHING)); \ } \ \ ->>>>>>> 0.12 OPTIONAL_DO_BACKTRACE \ BOX_WARNING("Exception thrown: " \ #type "(" #subtype ") " \ @@ -160,14 +138,6 @@ { \ std::ostringstream _box_throw_line; \ _box_throw_line << message; \ -<<<<<<< HEAD - if(!HideExceptionMessageGuard::ExceptionsHidden()) \ - { \ - OPTIONAL_DO_BACKTRACE \ - BOX_WARNING("Exception thrown: " \ - #type "(" #subtype ") (" << message << \ - ") at " __FILE__ "(" << __LINE__ << ")") \ -======= if((!HideExceptionMessageGuard::ExceptionsHidden() \ && !HideSpecificExceptionGuard::IsHidden( \ type::ExceptionType, type::subtype)) \ @@ -185,7 +155,6 @@ #type "(" #subtype ") (" << \ _box_throw_line.str() << \ ") at " __FILE__ ":" << __LINE__) \ ->>>>>>> 0.12 } \ throw type(type::subtype, _box_throw_line.str()); \ } |