Sync SignalTryCatch

Author: aaronj0

src/SignalTryCatch.h

@@ -18,19 +18,31 @@
 #define NEED_SIGJMP 1
 #endif
 
+// By default, the ExceptionContext_t class is expected in the namespace
+// CppyyLegacy, If it is expected in no namespace, one can explicitly define
+// NO_CPPYY_LEGACY_NAMESPACE at build time (e.g. if one wants to use ROOT).
+
+#ifndef NO_CPPYY_LEGACY_NAMESPACE
 namespace CppyyLegacy {
+#endif
 struct ExceptionContext_t {
 #ifdef NEED_SIGJMP
     sigjmp_buf fBuf;
 #else
     jmp_buf fBuf;
 #endif
 };
+#ifndef NO_CPPYY_LEGACY_NAMESPACE
 }
 
+using CppyyExceptionContext_t = CppyyLegacy::ExceptionContext_t;
+#else
+using CppyyExceptionContext_t = ExceptionContext_t;
+#endif
+
 // FIXME: This is a dummy, replace with cling equivalent of gException
-static CppyyLegacy::ExceptionContext_t DummyException;
-static CppyyLegacy::ExceptionContext_t *gException = &DummyException;
+static CppyyExceptionContext_t DummyException;
+static CppyyExceptionContext_t *gException = &DummyException;
 
 #ifdef NEED_SIGJMP
 # define CLING_EXCEPTION_SETJMP(buf) sigsetjmp(buf,1)
@@ -40,14 +52,14 @@ static CppyyLegacy::ExceptionContext_t *gException = &DummyException;
 
 #define CLING_EXCEPTION_RETRY \
     { \
-        static CppyyLegacy::ExceptionContext_t R__curr, *R__old = gException; \
+        static CppyyExceptionContext_t R__curr, *R__old = gException; \
         int R__code; \
         gException = &R__curr; \
         R__code = CLING_EXCEPTION_SETJMP(gException->fBuf); if (R__code) { }; {
 
 #define CLING_EXCEPTION_TRY \
     { \
-        static CppyyLegacy::ExceptionContext_t R__curr, *R__old = gException; \
+        static CppyyExceptionContext_t R__curr, *R__old = gException; \
         int R__code; \
         gException = &R__curr; \
         if ((R__code = CLING_EXCEPTION_SETJMP(gException->fBuf)) == 0) {
@@ -63,6 +75,6 @@ static CppyyLegacy::ExceptionContext_t *gException = &DummyException;
         gException = R__old; \
     }
 
-CPYCPPYY_IMPORT CppyyLegacy::ExceptionContext_t *gException;
+CPYCPPYY_IMPORT CppyyExceptionContext_t *gException;
 
 #endif