11 files changed, 19 insertions, 19 deletions
diff --git a/src/context/cdchunk_list.h b/src/context/cdchunk_list.h
index 3fa3c6b5d..e75f4de4d 100644
--- a/src/context/cdchunk_list.h
+++ b/src/context/cdchunk_list.h
@@ -137,7 +137,7 @@ protected:
       d_size(size),
       d_sizeAlloc(sizeAlloc) {
     }
-    ~CDChunkListSave() throw() {
+    ~CDChunkListSave() {
       this->destroy();
     }
     ContextObj* save(ContextMemoryManager* pCMM) {
@@ -322,7 +322,7 @@ public:
   /**
    * Destructor: delete the list
    */
-  ~CDChunkList() throw(AssertionException) {
+  ~CDChunkList() {
     this->destroy();
 
     if(this->d_callDestructor) {
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index 884234eb8..6ae74fbde 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -236,7 +236,7 @@ public:
     }
   }
 
-  ~CDOhash_map() throw(AssertionException) {
+  ~CDOhash_map() {
     destroy();
   }
 
@@ -327,7 +327,7 @@ public:
     d_trash() {
   }
 
-  ~CDHashMap() throw(AssertionException) {
+  ~CDHashMap() {
     Debug("gc") << "cdhashmap" << this
                 << " disappearing, destroying..." << std::endl;
     destroy();
diff --git a/src/context/cdinsert_hashmap.h b/src/context/cdinsert_hashmap.h
index 6e772068b..e901e9413 100644
--- a/src/context/cdinsert_hashmap.h
+++ b/src/context/cdinsert_hashmap.h
@@ -271,7 +271,7 @@ public:
   /**
    * Destructor: delete the d_insertMap
    */
-  ~CDInsertHashMap() throw(AssertionException) {
+  ~CDInsertHashMap() {
     this->destroy();
     delete d_insertMap;
   }
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index 4e42c4688..4a5ebfd30 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -257,7 +257,7 @@ public:
   /**
    * Destructor: delete the list
    */
-  ~CDList() throw(AssertionException) {
+  ~CDList() {
     this->destroy();
 
     if(this->d_callDestructor) {
diff --git a/src/context/cdo.h b/src/context/cdo.h
index e2fdcf9bd..21465181c 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -140,7 +140,7 @@ public:
   /**
    * Destructor - call destroy() method
    */
-  ~CDO() throw(AssertionException) { destroy(); }
+  ~CDO() { destroy(); }
 
   /**
    * Set the data in the CDO.  First call makeCurrent.
diff --git a/src/context/cdtrail_hashmap.h b/src/context/cdtrail_hashmap.h
index e89c1b528..90816d542 100644
--- a/src/context/cdtrail_hashmap.h
+++ b/src/context/cdtrail_hashmap.h
@@ -452,7 +452,7 @@ public:
   /**
    * Destructor: delete the map
    */
-  ~CDTrailHashMap() throw(AssertionException) {
+  ~CDTrailHashMap() {
     this->destroy();
     delete d_trailMap;
   }
diff --git a/src/context/context.cpp b/src/context/context.cpp
index 9c0416ce8..8f151ad08 100644
--- a/src/context/context.cpp
+++ b/src/context/context.cpp
@@ -35,7 +35,7 @@ Context::Context() : d_pCNOpre(NULL), d_pCNOpost(NULL) {
 }
 
 
-Context::~Context() throw(AssertionException) {
+Context::~Context() {
   // Delete all Scopes
   popto(0);
 
@@ -306,7 +306,7 @@ ContextNotifyObj::ContextNotifyObj(Context* pContext, bool preNotify) {
 }
 
 
-ContextNotifyObj::~ContextNotifyObj() throw(AssertionException) {
+ContextNotifyObj::~ContextNotifyObj() {
   if(d_pCNOnext != NULL) {
     d_pCNOnext->d_ppCNOprev = d_ppCNOprev;
   }
diff --git a/src/context/context.h b/src/context/context.h
index 4f45e8954..f7707bdec 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -152,7 +152,7 @@ public:
   /**
    * Destructor: pop all scopes, delete ContextMemoryManager
    */
-  ~Context() throw(AssertionException);
+  ~Context();
 
   /**
    * Return the current (top) scope
@@ -277,7 +277,7 @@ public:
    * Destructor: Restore all of the objects in ContextObjList.  Defined inline
    * below.
    */
-  ~Scope() throw(AssertionException);
+  ~Scope();
 
   /**
    * Get the Context for this Scope
@@ -615,7 +615,7 @@ public:
   /**
    * Destructor does nothing: subclass must explicitly call destroy() instead.
    */
-  virtual ~ContextObj() throw(AssertionException) {}
+  virtual ~ContextObj() {}
 
   /**
    * If you want to allocate a ContextObj object on the heap, use this
@@ -711,7 +711,7 @@ public:
   /**
    * Destructor: removes object from list
    */
-  virtual ~ContextNotifyObj() throw(AssertionException);
+  virtual ~ContextNotifyObj();
 
 };/* class ContextNotifyObj */
 
@@ -725,7 +725,7 @@ inline void ContextObj::makeSaveRestorePoint() throw(AssertionException) {
   update();
 }
 
-inline Scope::~Scope() throw(AssertionException) {
+inline Scope::~Scope() {
   // Call restore() method on each ContextObj object in the list.
   // Note that it is the responsibility of restore() to return the
   // next item in the list.
diff --git a/src/context/context_mm.cpp b/src/context/context_mm.cpp
index 0a6b08b6a..2dc2c03bb 100644
--- a/src/context/context_mm.cpp
+++ b/src/context/context_mm.cpp
@@ -63,7 +63,7 @@ ContextMemoryManager::ContextMemoryManager() : d_indexChunkList(0) {
 }
 
 
-ContextMemoryManager::~ContextMemoryManager() throw() {
+ContextMemoryManager::~ContextMemoryManager() {
   // Delete all chunks
   while(!d_chunkList.empty()) {
     free(d_chunkList.back());
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index 99b448cf2..673fb9098 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -118,7 +118,7 @@ public:
   /**
    * Destructor - deletes all memory in all regions
    */
-  ~ContextMemoryManager() throw();
+  ~ContextMemoryManager();
 
   /**
    * Allocate size bytes from the current region
@@ -161,7 +161,7 @@ public:
   ContextMemoryAllocator(ContextMemoryManager* mm) throw() : d_mm(mm) {}
   template <class U>
   ContextMemoryAllocator(const ContextMemoryAllocator<U>& alloc) throw() : d_mm(alloc.getCMM()) {}
-  ~ContextMemoryAllocator() throw() {}
+  ~ContextMemoryAllocator() {}
 
   ContextMemoryManager* getCMM() const { return d_mm; }
   T* address(T& v) const { return &v; }
diff --git a/src/context/stacking_vector.h b/src/context/stacking_vector.h
index b737c40ae..4b482c9b0 100644
--- a/src/context/stacking_vector.h
+++ b/src/context/stacking_vector.h
@@ -50,7 +50,7 @@ public:
     d_offset(ctxt, 0) {
   }
 
-  ~StackingVector() throw() { }
+  ~StackingVector() { }
 
   /**
    * Return a value from the vector.  If n is not a key in