Relaxing the throw specifiers for the destructors for Node, TypeNode, the context/ classes, and their subclasses. Fixes compilation issues with clang 3.5 and -std=c++11 'exception specification of overriding function is more lax than base version' for a couple of different classes.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/expr/node.h b/src/expr/node.h
index 998294da3..c9bfb75a4 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -308,7 +308,7 @@ public:
    * Destructor. If ref_count is true it will decrement the reference count
    * and, if zero, collect the NodeValue.
    */
-  ~NodeTemplate() throw(AssertionException);
+  ~NodeTemplate();
 
   /**
    * Return the null node.
@@ -1089,7 +1089,7 @@ NodeTemplate<ref_count>::NodeTemplate(const Expr& e) {
 }
 
 template <bool ref_count>
-NodeTemplate<ref_count>::~NodeTemplate() throw(AssertionException) {
+NodeTemplate<ref_count>::~NodeTemplate() {
   Assert(d_nv != NULL, "Expecting a non-NULL expression value!");
   if(ref_count) {
     // shouldn't ever fail
diff --git a/src/expr/type_node.h b/src/expr/type_node.h
index 46fdaa143..0cada0df2 100644
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -116,7 +116,7 @@ public:
    * Destructor. If ref_count is true it will decrement the reference count
    * and, if zero, collect the NodeValue.
    */
-  ~TypeNode() throw(AssertionException);
+  ~TypeNode();
 
   /**
    * Assignment operator for nodes, copies the relevant information from node
@@ -785,7 +785,7 @@ inline TypeNode::TypeNode(const TypeNode& typeNode) {
   d_nv->inc();
 }
 
-inline TypeNode::~TypeNode() throw(AssertionException) {
+inline TypeNode::~TypeNode() {
   Assert(d_nv != NULL, "Expecting a non-NULL expression value!");
   d_nv->dec();
 }