From 923b4ce39b68992ecd4c404c88a12bb3592d07a6 Mon Sep 17 00:00:00 2001 From: Axel Naumann Date: Tue, 1 Dec 2015 15:41:16 +0100 Subject: [PATCH] Also strip the "runtime" part of the Interpreter exception here. --- include/cling/UserInterface/CompilationException.h | 2 +- lib/UserInterface/UserInterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/cling/UserInterface/CompilationException.h b/include/cling/UserInterface/CompilationException.h index bcf480f1..0823fd9f 100644 --- a/include/cling/UserInterface/CompilationException.h +++ b/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/lib/UserInterface/UserInterface.cpp b/lib/UserInterface/UserInterface.cpp index 3ead7348..d451014d 100644 --- a/lib/UserInterface/UserInterface.cpp +++ b/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'; }