fix build

guanqun · Oct 26, 2011 · 576a669 · 576a669
1 parent 2ba6913
commit 576a669
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/db/client.cpp b/db/client.cpp
@@ -81,7 +81,7 @@ namespace mongo {
     */
     static unsigned long long nThreads = 0;
     void assertStartingUp() { 
-        dassert( nThreads <= 1 );
+        assert( nThreads <= 1 );
     }
     Client& Client::initThread(const char *desc, AbstractMessagingPort *mp) {
 #if defined(_DEBUG)

diff --git a/db/cmdline.cpp b/db/cmdline.cpp
@@ -486,7 +486,7 @@ namespace mongo {
         return s.str();
     }
 
-    casi< map<string,ParameterValidator*> * > pv_all = 0;
+    casi< map<string,ParameterValidator*> * > pv_all (NULL);
 
     ParameterValidator::ParameterValidator( const string& name ) : _name( name ) {
         if ( ! pv_all)