From 3455811cc3de59343a3b2900de0b4e6f3fcef4dc Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Thu, 21 Nov 2019 16:44:42 +0300
Subject: [PATCH] core: CATCH_ENTRY_NO_RETURN made parameterless,
 CATCH_ENTRY_NO_RETURN_CUSTOM added

---
 contrib/epee/include/misc_helpers.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/epee/include/misc_helpers.h b/contrib/epee/include/misc_helpers.h
index 8c5aba18..dd3067c8 100644
--- a/contrib/epee/include/misc_helpers.h
+++ b/contrib/epee/include/misc_helpers.h
@@ -77,7 +77,7 @@
 /// @details Useful within a dtor - but only if nested within another try block
 ///    (since we can still potentially throw here). See NESTED_*ENTRY()
 /// @todo Exception dispatcher class
-#define CATCH_ENTRY_NO_RETURN(location, custom_code) } \
+#define CATCH_ENTRY_NO_RETURN_CUSTOM(location, custom_code) } \
   catch(const std::exception& ex) \
 { \
   (void)(ex); \
@@ -90,6 +90,7 @@
   custom_code; \
 }
 
+#define CATCH_ENTRY_NO_RETURN() CATCH_ENTRY_NO_RETURN_CUSTOM(LOCATION_SS, (void)0)
 
 #define CATCH_ENTRY_WITH_FORWARDING_EXCEPTION() } \
   catch(const std::exception& ex) \
@@ -108,7 +109,7 @@
 #define NESTED_TRY_ENTRY() try { TRY_ENTRY();
 
 #define NESTED_CATCH_ENTRY(location) \
-  CATCH_ENTRY_NO_RETURN(location, {}); \
+  CATCH_ENTRY_NO_RETURN_CUSTOM(location, {}); \
   } catch (...) {}