From 2e775ef2fbdf4aa6e5bbefea1e0d76f4e6c3ad36 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sat, 6 Jun 2020 08:16:35 -0700 Subject: [PATCH] drop THROW_BASE_EXCEPTION_CAUSE() --- src/misc/pv/epicsException.h | 1 - testApp/misc/testBaseException.cpp | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/src/misc/pv/epicsException.h b/src/misc/pv/epicsException.h index e9fc50a..f32cc6f 100644 --- a/src/misc/pv/epicsException.h +++ b/src/misc/pv/epicsException.h @@ -229,7 +229,6 @@ private: #endif #define THROW_BASE_EXCEPTION(msg) THROW_EXCEPTION2(::epics::pvData::BaseException, msg) -#define THROW_BASE_EXCEPTION_CAUSE(msg, cause) THROW_EXCEPTION2(::epics::pvData::BaseException, msg) } } diff --git a/testApp/misc/testBaseException.cpp b/testApp/misc/testBaseException.cpp index ef36d7e..574fe93 100644 --- a/testApp/misc/testBaseException.cpp +++ b/testApp/misc/testBaseException.cpp @@ -31,16 +31,6 @@ void Unroller::unroll<0>(double /*d*/) { THROW_BASE_EXCEPTION("the root cause"); } -void internalTestBaseException(int /*unused*/ = 0) -{ - try { - // NOTE: 5, 4, 3, 2, 1 calls will be optimized and not shown - Unroller().unroll<5>(42.0); - } catch (BaseException& be3) { - THROW_BASE_EXCEPTION_CAUSE("exception 1", be3); - } -} - void testBaseExceptionTest() { printf("testBaseException... "); @@ -50,16 +40,6 @@ void testBaseExceptionTest() { printf("\n\n%s\n\n", be.what()); } - try { - try { - internalTestBaseException(); - } catch (BaseException& be2) { - THROW_BASE_EXCEPTION_CAUSE("exception 2", be2); - } - } catch (BaseException& be) { - printf("\n\n%s\n\n", be.what()); - } - testPass("testBaseException"); }