diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2012-03-26 12:58:35 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2012-03-26 12:58:52 -0400 |
| commit | bd6d0c99195e324e14390205e2bc6ff88c01e365 (patch) | |
| tree | f9306b37b7d3302b4dd6e5f628fcf9886a09cf15 /src/mongo/db/db.h | |
| parent | a56eef7bd9a5d390182ea64118e11420b052a380 (diff) | |
| download | mongo-bd6d0c99195e324e14390205e2bc6ff88c01e365.tar.gz | |
replace assert with verify SERVER-1259
Diffstat (limited to 'src/mongo/db/db.h')
| -rw-r--r-- | src/mongo/db/db.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/db.h b/src/mongo/db/db.h index 94841024194..7d2928c25ba 100644 --- a/src/mongo/db/db.h +++ b/src/mongo/db/db.h @@ -35,7 +35,7 @@ namespace mongo { dbtemprelease() { const Client& c = cc(); _context = c.getContext(); - assert( Lock::isLocked() ); + verify( Lock::isLocked() ); if( Lock::nested() ) { Lock::nested(); massert(10298 , "can't temprelease nested lock", false); @@ -44,7 +44,7 @@ namespace mongo { _context->unlocked(); } tr.reset(new Lock::TempRelease); - assert( c.curop() ); + verify( c.curop() ); c.curop()->yielded(); } ~dbtemprelease() { @@ -55,7 +55,7 @@ namespace mongo { }; /** must be write locked - no assert (and no release) if nested write lock + no verify(and no release) if nested write lock a lot like dbtempreleasecond, eliminate? */ struct dbtempreleasewritelock { @@ -65,13 +65,13 @@ namespace mongo { dbtempreleasewritelock() { const Client& c = cc(); _context = c.getContext(); - assert( Lock::isW() ); + verify( Lock::isW() ); if( Lock::nested() ) return; if ( _context ) _context->unlocked(); tr.reset(new Lock::TempRelease); - assert( c.curop() ); + verify( c.curop() ); c.curop()->yielded(); } ~dbtempreleasewritelock() { |