SERVER-5724 Mark dbtemprelase{,cond,if} destructors as throwing

This is a stop-gap solution to prevent c++11 builds from terminating when
relocking and reinitializing Client::Context fails. In c++11 destructors that
aren't explicitly marked as throwing are implicitly noexcept(true).

For similar reasons it is invalid to put dbtemprelease into a smart pointer
since the smart pointer's destructor isn't marked as throwing. The few places
that did that were also changed.

dbtemprelasewritelock is unused so it was removed rather than fixed.

1 files changed, 12 insertions, 30 deletions

diff --git a/src/mongo/db/db.h b/src/mongo/db/db.h
index c178dedd323..9ff1a1541a7 100644
--- a/src/mongo/db/db.h
+++ b/src/mongo/db/db.h
@@ -41,6 +41,12 @@ namespace mongo {
     // todo: relocked is being called when there was no unlock below. 
     //       that is weird.
 
+    /**
+     * Releases the current lock for the duration of its lifetime.
+     *
+     * WARNING: do not put in a smart pointer or any other class. If you absolutely must, you need
+     * to add the throw(DBException) annotation to it's destructor.
+     */
     struct dbtemprelease {
         Client::Context * _context;
         scoped_ptr<Lock::TempRelease> tr;
@@ -58,34 +64,7 @@ namespace mongo {
             verify( c.curop() );
             c.curop()->yielded();
         }
-        ~dbtemprelease() {
-            tr.reset();
-            if ( _context ) 
-                _context->relocked();
-        }
-    };
-
-    /** must be write locked
-        no verify(and no release) if nested write lock 
-        a lot like dbtempreleasecond, eliminate?
-    */
-    struct dbtempreleasewritelock {
-        Client::Context * _context;
-        int _locktype;
-        scoped_ptr<Lock::TempRelease> tr;
-        dbtempreleasewritelock() {
-            const Client& c = cc();
-            _context = c.getContext();
-            verify( Lock::isW() );
-            if( Lock::nested() )
-                return;
-            if ( _context ) 
-                _context->unlocked();
-            tr.reset(new Lock::TempRelease);
-            verify( c.curop() );
-            c.curop()->yielded();            
-        }
-        ~dbtempreleasewritelock() {
+        ~dbtemprelease() throw(DBException) {
             tr.reset();
             if ( _context ) 
                 _context->relocked();
@@ -93,7 +72,10 @@ namespace mongo {
     };
 
     /**
-       only does a temp release if we're not nested and have a lock
+     * only does a temp release if we're not nested and have a lock
+     *
+     * WARNING: do not put in a smart pointer or any other class. If you absolutely must, you need
+     * to add the throw(DBException) annotation to it's destructor.
      */
     class dbtempreleasecond : boost::noncopyable {
         dbtemprelease * real;
@@ -107,7 +89,7 @@ namespace mongo {
                 }
             }
         }
-        ~dbtempreleasecond() {
+        ~dbtempreleasecond() throw(DBException) {
             if ( real ) {
                 delete real;
                 real = 0;