Removing miscellaneous throw specifiers. (#1474)

3 files changed, 9 insertions, 7 deletions

diff --git a/src/main/main.h b/src/main/main.h
index 8a5d0971e..0a5139c59 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -56,12 +56,13 @@ extern bool segvSpin;
 /** A pointer to the options in play */
 extern CVC4_THREAD_LOCAL Options* pOptions;
 
-/** Initialize the driver.  Sets signal handlers for SIGINT and SIGSEGV. */
-void cvc4_init() throw(Exception);
+/** Initialize the driver.  Sets signal handlers for SIGINT and SIGSEGV.
+ * This can throw a CVC4::Exception.
+ */
+void cvc4_init();
 
 /** Shutdown the driver. Frees memory for the signal handlers. */
-void cvc4_shutdown() throw();
-
+void cvc4_shutdown() noexcept;
 
 }/* CVC4::main namespace */
 }/* CVC4 namespace */
diff --git a/src/main/portfolio_util.h b/src/main/portfolio_util.h
index 5ed9a36fd..4f80f24ef 100644
--- a/src/main/portfolio_util.h
+++ b/src/main/portfolio_util.h
@@ -47,7 +47,7 @@ public:
     cnt(0)
   {}
 
-  ~PortfolioLemmaOutputChannel() throw() { }
+  ~PortfolioLemmaOutputChannel() {}
 
   void notifyNewLemma(Expr lemma);
 };/* class PortfolioLemmaOutputChannel */
@@ -65,7 +65,7 @@ public:
                              VarMap& to,
                                VarMap& from);
 
-  ~PortfolioLemmaInputChannel() throw() { }
+  ~PortfolioLemmaInputChannel() {}
 
   bool hasNewLemma();
   Expr getNewLemma();
diff --git a/src/main/util.cpp b/src/main/util.cpp
index 43c880a7f..de6b47aa5 100644
--- a/src/main/util.cpp
+++ b/src/main/util.cpp
@@ -261,7 +261,8 @@ void cvc4terminate() {
 }
 
 /** Initialize the driver.  Sets signal handlers for SIGINT and SIGSEGV. */
-void cvc4_init() throw(Exception) {
+void cvc4_init()
+{
 #ifdef CVC4_DEBUG
   LastExceptionBuffer::setCurrent(new LastExceptionBuffer());
 #endif