From 53b60be37b1d77c6fdd5da7e7c46fec3825948ea Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Tue, 1 Dec 2015 15:41:16 +0100
Subject: [PATCH] Also strip the "runtime" part of the Interpreter exception
here.
---
.../cling/include/cling/UserInterface/CompilationException.h | 2 +-
interpreter/cling/lib/UserInterface/UserInterface.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interpreter/cling/include/cling/UserInterface/CompilationException.h b/interpreter/cling/include/cling/UserInterface/CompilationException.h
index bcf480f19ee..0823fd9f743 100644
--- a/interpreter/cling/include/cling/UserInterface/CompilationException.h
+++ b/interpreter/cling/include/cling/UserInterface/CompilationException.h
@@ -27,7 +27,7 @@ namespace cling {
/// Note that this exception is *not* thrown during the execution of the
/// user's code but during its compilation (at runtime).
class CompilationException:
- public virtual runtime::InterpreterException,
+ public virtual InterpreterException,
public virtual std::runtime_error {
public:
CompilationException(const std::string& reason):
diff --git a/interpreter/cling/lib/UserInterface/UserInterface.cpp b/interpreter/cling/lib/UserInterface/UserInterface.cpp
index 3ead73482ac..d451014d567 100644
--- a/interpreter/cling/lib/UserInterface/UserInterface.cpp
+++ b/interpreter/cling/lib/UserInterface/UserInterface.cpp
@@ -149,10 +149,10 @@ namespace cling {
TI.SetPrompt(Prompt.c_str());
}
- catch(runtime::NullDerefException& e) {
+ catch(NullDerefException& e) {
e.diagnose();
}
- catch(runtime::InterpreterException& e) {
+ catch(InterpreterException& e) {
llvm::errs() << ">>> Caught an interpreter exception!\n"
<< ">>> " << e.what() << '\n';
}
--
GitLab