From 8630a308f8becc8c1ead2d835ac5ec759335c724 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sun, 14 Jun 2020 00:40:56 +0300 Subject: [PATCH] don't throw something that is not an exception --- OMParser/.gitignore | 2 +- .../Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp | 2 +- OMParser/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OMParser/.gitignore b/OMParser/.gitignore index e640009fb08..fb2a380ccef 100644 --- a/OMParser/.gitignore +++ b/OMParser/.gitignore @@ -19,4 +19,4 @@ modelicaVisitor.cpp modelicaVisitor.h *.o *.a -test/ \ No newline at end of file +test/ diff --git a/OMParser/3rdParty/antlr4/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp b/OMParser/3rdParty/antlr4/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp index 2e58a962593..f551cfc3b71 100644 --- a/OMParser/3rdParty/antlr4/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp +++ b/OMParser/3rdParty/antlr4/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp @@ -109,7 +109,7 @@ ParseTreePattern ParseTreePatternMatcher::compile(const std::string &pattern, in throw e; #else } catch (std::exception & /*e*/) { - std::throw_with_nested((const char*)"Cannot invoke start rule"); // Wrap any other exception. We should however probably use one of the ANTLR exceptions here. + std::throw_with_nested( std::runtime_error((const char*)"Cannot invoke start rule") ); // Wrap any other exception. We should however probably use one of the ANTLR exceptions here. #endif } diff --git a/OMParser/Makefile b/OMParser/Makefile index a920901552e..1c3b86a214c 100644 --- a/OMParser/Makefile +++ b/OMParser/Makefile @@ -1,6 +1,6 @@ ifeq ($(OMBUILDDIR),) -OMBUILDDIR=$(CURDIR)/build +OMBUILDDIR=$(CURDIR)/../build endif CMAKE=cmake