diff options
Diffstat (limited to 'lib/common/MainHelper.h')
| -rw-r--r-- | lib/common/MainHelper.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/common/MainHelper.h b/lib/common/MainHelper.h index 453b5b5f..3c6e9ff0 100644 --- a/lib/common/MainHelper.h +++ b/lib/common/MainHelper.h @@ -12,16 +12,12 @@ #include <stdio.h> -<<<<<<< HEAD -#include "BoxException.h" -======= #ifdef NEED_BOX_VERSION_H # include "BoxVersion.h" #endif #include "BoxException.h" #include "Logging.h" ->>>>>>> 0.12 #define MAINHELPER_START \ if(argc == 2 && ::strcmp(argv[1], "--version") == 0) \ @@ -29,18 +25,6 @@ MEMLEAKFINDER_INIT \ MEMLEAKFINDER_START \ try { -<<<<<<< HEAD -#define MAINHELPER_END \ - } catch(BoxException &e) { \ - printf("Exception: %s (%d/%d)\n", e.what(), e.GetType(), e.GetSubType()); \ - return 1; \ - } catch(std::exception &e) { \ - printf("Exception: %s\n", e.what()); \ - return 1; \ - } catch(...) { \ - printf("Exception: <UNKNOWN>\n"); \ - return 1; } -======= #define MAINHELPER_END \ } catch(std::exception &e) { \ @@ -50,7 +34,6 @@ BOX_FATAL("UNKNOWN"); \ return 1; \ } ->>>>>>> 0.12 #ifdef BOX_MEMORY_LEAK_TESTING #define MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT(file, marker) \ |