Port bug 1570982 - remove CPP_THROW_NEW. rs=bustage-fix

db/mork/src/morkDeque.h

@@ -56,7 +56,7 @@ class morkNext /*d*/ {
 
  public:  // link memory management operators
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkNext::MakeNewNext(inSize, ioHeap, ev);
   }
 
@@ -153,7 +153,7 @@ class morkLink /*d*/ {
 
  public:  // link memory management operators
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkLink::MakeNewLink(inSize, ioHeap, ev);
   }
 };

db/mork/src/morkFactory.h

@@ -172,12 +172,12 @@ class morkFactory : public morkObject, public nsIMdbFactory {  // nsIMdbObject
   void CloseFactory(morkEnv* ev);  // called by CloseMorkNode();
 
  public:  // morkNode memory management operators
-  void* operator new(size_t inSize) CPP_THROW_NEW {
+  void* operator new(size_t inSize) noexcept(true) {
     return ::operator new(inSize);
   }
 
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkNode::MakeNew(inSize, ioHeap, ev);
   }
 

db/mork/src/morkHandle.h

@@ -85,16 +85,16 @@ class morkHandle : public morkNode {
 
  public:  // morkHandle memory management operators
   void* operator new(size_t inSize, morkPool& ioPool, morkZone& ioZone,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return ioPool.NewHandle(ev, inSize, &ioZone);
   }
 
   void* operator new(size_t inSize, morkPool& ioPool,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return ioPool.NewHandle(ev, inSize, (morkZone*)0);
   }
 
-  void* operator new(size_t inSize, morkHandleFace* ioFace) CPP_THROW_NEW {
+  void* operator new(size_t inSize, morkHandleFace* ioFace) noexcept(true) {
     MORK_USED_1(inSize);
     return ioFace;
   }

db/mork/src/morkNode.h

@@ -154,7 +154,7 @@ class morkNode /*: public nsISupports */ {  // base class for constructing Mork
 
  public:  // morkNode memory management operators
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkNode::MakeNew(inSize, ioHeap, ev);
   }
 

db/mork/src/morkPool.h

@@ -86,11 +86,11 @@ class morkPool : public morkNode {
 
  public:  // morkNode memory management operators
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkNode::MakeNew(inSize, ioHeap, ev);
   }
 
-  void* operator new(size_t inSize) CPP_THROW_NEW {
+  void* operator new(size_t inSize) noexcept(true) {
     return ::operator new(inSize);
   }
 

db/mork/src/morkTable.h

@@ -479,7 +479,7 @@ class morkTable : public morkObject, public morkLink, public nsIMdbTable {
 
  public:  // morkNode memory management operators
   void* operator new(size_t inSize, nsIMdbHeap& ioHeap,
-                     morkEnv* ev) CPP_THROW_NEW {
+                     morkEnv* ev) noexcept(true) {
     return morkNode::MakeNew(inSize, ioHeap, ev);
   }
 

rdf/base/nsCompositeDataSource.cpp

@@ -26,7 +26,6 @@
 
 */
 
-#include "xpcom-config.h"
 #include "nsCOMPtr.h"
 #include "nsIComponentManager.h"
 #include "nsIRDFCompositeDataSource.h"