move the var 'database' inside Client object

2009-10-14 14:34:38 -04:00
parent cd3b329548
commit 16f8b77c5e
26 changed files with 137 additions and 105 deletions
--- a/dbtests/querytests.cpp
+++ b/dbtests/querytests.cpp
@@ -608,7 +608,7 @@ namespace QueryTests {
            dblock lk;
            setClient( "unittests.DirectLocking" );
            client().remove( "a.b", BSONObj() );
-            ASSERT_EQUALS( "unittests", database->name );
+            ASSERT_EQUALS( "unittests", cc().database()->name );
        }
        const char *ns;
    };
@@ -704,7 +704,7 @@ namespace QueryTests {
        }

        int count(){
-            return client().count( ns() );
+            return (int) client().count( ns() );
        }
        
        void run(){