From 6d932bfaf11e4699355fedc45e28b353b8877130 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 18 Sep 2014 21:52:10 +0000 Subject: merge into trunk git-svn-id: http://svn.miranda-ng.org/main/trunk@10515 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/definitions.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'protocols/WhatsApp/src/definitions.h') diff --git a/protocols/WhatsApp/src/definitions.h b/protocols/WhatsApp/src/definitions.h index 4817f56a98..7f8f8a7222 100644 --- a/protocols/WhatsApp/src/definitions.h +++ b/protocols/WhatsApp/src/definitions.h @@ -4,13 +4,10 @@ #define FLAG_CONTAINS(x,y) ( ( x & y ) == y ) #define REMOVE_FLAG(x,y) ( x = ( x & ~y )) -#define CODE_BLOCK_TRY try { -#define CODE_BLOCK_CATCH(ex) } catch (ex& e) { debugLogA("Exception: %s", e.what()); -#define CODE_BLOCK_CATCH_UNKNOWN } catch (...) { debugLogA("Unknown exception"); -#define CODE_BLOCK_CATCH_ALL } catch (WAException& e) { debugLogA("Exception: %s", e.what()); \ - } catch (exception& e) { debugLogA("Exception: %s", e.what()); \ - } catch (...) { debugLogA("Unknown exception"); } -#define CODE_BLOCK_END } +#define CODE_BLOCK_CATCH_ALL \ + catch (WAException& e) { debugLogA("Exception: %s", e.what()); \ + } catch (exception& e) { debugLogA("Exception: %s", e.what()); \ + } catch (...) { debugLogA("Unknown exception"); } #define NIIF_INTERN_TCHAR NIIF_INTERN_UNICODE -- cgit v1.2.3