Imported Upstream version 1.6.0

1 files changed, 5 insertions, 5 deletions

diff --git a/dbtests/perf/perftest.cpp b/dbtests/perf/perftest.cpp
index 02b2fad..f86a1c3 100644
--- a/dbtests/perf/perftest.cpp
+++ b/dbtests/perf/perftest.cpp
@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "stdafx.h"
+#include "pch.h"
 
 #include "../../client/dbclient.h"
 #include "../../db/instance.h"
@@ -42,7 +42,7 @@ DBClientBase *client_;
 // (ie allocation) work for another test.
 template< class T >
 string testDb( T *t = 0 ) {
-    string name = mongo::regression::demangleName( typeid( T ) );
+    string name = mongo::demangleName( typeid( T ) );
     // Make filesystem safe.
     for( string::iterator i = name.begin(); i != name.end(); ++i )
         if ( *i == ':' )
@@ -629,7 +629,7 @@ namespace Plan {
         }
         void run() {
             for( int i = 0; i < 10000; ++i )
-                QueryPlanSet s( ns_.c_str(), BSONObj(), BSONObj(), &hintElt_ );
+                MultiPlanScanner s( ns_.c_str(), BSONObj(), BSONObj(), &hintElt_ );
         }
         string ns_;
         auto_ptr< dblock > lk_;
@@ -650,7 +650,7 @@ namespace Plan {
         void run() {
             Client::Context ctx( ns_ );
             for( int i = 0; i < 10000; ++i )
-                QueryPlanSet s( ns_.c_str(), BSONObj(), BSON( "a" << 1 ) );
+                MultiPlanScanner s( ns_.c_str(), BSONObj(), BSON( "a" << 1 ) );
         }
         string ns_;
         auto_ptr< dblock > lk_;
@@ -669,7 +669,7 @@ namespace Plan {
         void run() {
             Client::Context ctx( ns_.c_str() );
             for( int i = 0; i < 10000; ++i )
-                QueryPlanSet s( ns_.c_str(), BSON( "a" << 1 ), BSONObj() );
+                MultiPlanScanner s( ns_.c_str(), BSON( "a" << 1 ), BSONObj() );
         }
         string ns_;
         auto_ptr< dblock > lk_;