14 files changed, 1055 insertions, 875 deletions

diff --git a/dbtests/basictests.cpp b/dbtests/basictests.cpp
index 80bd7d70892..46a7dbc22bd 100644
--- a/dbtests/basictests.cpp
+++ b/dbtests/basictests.cpp
@@ -433,9 +433,10 @@ namespace BasicTests {
     class DatabaseValidNames {
     public:
         void run() {
-            ASSERT( Database::validDBName( "foo" ) );
-            ASSERT( ! Database::validDBName( "foo/bar" ) );
-            ASSERT( ! Database::validDBName( "foo.bar" ) );
+            ASSERT( NamespaceString::validDBName( "foo" ) );
+            ASSERT( ! NamespaceString::validDBName( "foo/bar" ) );
+            ASSERT( ! NamespaceString::validDBName( "foo bar" ) );
+            ASSERT( ! NamespaceString::validDBName( "foo.bar" ) );
 
             ASSERT( NamespaceString::normal( "asdads" ) );
             ASSERT( ! NamespaceString::normal( "asda$ds" ) );
@@ -450,13 +451,15 @@ namespace BasicTests {
             bool isNew = false;
             // this leaks as ~Database is private
             // if that changes, should put this on the stack
-            Database * db = new Database( "dbtests_basictests_ownsns" , isNew );
-            assert( isNew );
+            {
+                Database * db = new Database( "dbtests_basictests_ownsns" , isNew );
+                assert( isNew );
 
-            ASSERT( db->ownsNS( "dbtests_basictests_ownsns.x" ) );
-            ASSERT( db->ownsNS( "dbtests_basictests_ownsns.x.y" ) );
-            ASSERT( ! db->ownsNS( "dbtests_basictests_ownsn.x.y" ) );
-            ASSERT( ! db->ownsNS( "dbtests_basictests_ownsnsa.x.y" ) );
+                ASSERT( db->ownsNS( "dbtests_basictests_ownsns.x" ) );
+                ASSERT( db->ownsNS( "dbtests_basictests_ownsns.x.y" ) );
+                ASSERT( ! db->ownsNS( "dbtests_basictests_ownsn.x.y" ) );
+                ASSERT( ! db->ownsNS( "dbtests_basictests_ownsnsa.x.y" ) );
+            }
         }
     };
 
diff --git a/dbtests/d_chunk_manager_tests.cpp b/dbtests/d_chunk_manager_tests.cpp
index bcfe9fa9ec1..2bcc90faf7a 100644
--- a/dbtests/d_chunk_manager_tests.cpp
+++ b/dbtests/d_chunk_manager_tests.cpp
@@ -185,7 +185,7 @@ namespace {
 
             BSONArray chunks = BSONArray();
 
-            ASSERT_EXCEPTION( ShardChunkManager s ( collection , chunks ) , UserException );
+            ASSERT_THROWS( ShardChunkManager s ( collection , chunks ) , UserException );
         }
     };
 
@@ -240,7 +240,7 @@ namespace {
             // [15,0-25,0) overlaps [10,0-20,0)
             BSONObj min = BSON( "a" << 15 << "b" << 0 );
             BSONObj max = BSON( "a" << 25 << "b" << 0 );
-            ASSERT_EXCEPTION( s.clonePlus ( min , max , 1 /* TODO test version */ ) , UserException );
+            ASSERT_THROWS( s.clonePlus ( min , max , 1 /* TODO test version */ ) , UserException );
         }
     };
 
@@ -307,13 +307,13 @@ namespace {
             // deleting non-existing chunk [25,0-28,0)
             BSONObj min1 = BSON( "a" << 25 << "b" << 0 );
             BSONObj max1 = BSON( "a" << 28 << "b" << 0 );
-            ASSERT_EXCEPTION( s.cloneMinus( min1 , max1 , 1 /* TODO test version */ ) , UserException );
+            ASSERT_THROWS( s.cloneMinus( min1 , max1 , 1 /* TODO test version */ ) , UserException );
 
 
             // deletin an overlapping range (not exactly a chunk) [15,0-25,0)
             BSONObj min2 = BSON( "a" << 15 << "b" << 0 );
             BSONObj max2 = BSON( "a" << 25 << "b" << 0 );
-            ASSERT_EXCEPTION( s.cloneMinus( min2 , max2 , 1 /* TODO test version */ ) , UserException );
+            ASSERT_THROWS( s.cloneMinus( min2 , max2 , 1 /* TODO test version */ ) , UserException );
         }
     };
 
@@ -376,13 +376,13 @@ namespace {
             BSONObj badSplit = BSON( "a" << 5 << "b" << 0 );
             vector<BSONObj> splitKeys;
             splitKeys.push_back( badSplit );
-            ASSERT_EXCEPTION( s.cloneSplit( min , max , splitKeys , ShardChunkVersion( 1 ) ) , UserException );
+            ASSERT_THROWS( s.cloneSplit( min , max , splitKeys , ShardChunkVersion( 1 ) ) , UserException );
 
             BSONObj badMax = BSON( "a" << 25 << "b" << 0 );
             BSONObj split = BSON( "a" << 15 << "b" << 0 );
             splitKeys.clear();
             splitKeys.push_back( split );
-            ASSERT_EXCEPTION( s.cloneSplit( min , badMax, splitKeys , ShardChunkVersion( 1 ) ) , UserException );
+            ASSERT_THROWS( s.cloneSplit( min , badMax, splitKeys , ShardChunkVersion( 1 ) ) , UserException );
         }
     };
 
@@ -426,7 +426,7 @@ namespace {
 
             // if we remove the only chunk, the only version accepted is 0
             ShardChunkVersion nonZero = 99;
-            ASSERT_EXCEPTION( s.cloneMinus( min , max , nonZero ) , UserException );
+            ASSERT_THROWS( s.cloneMinus( min , max , nonZero ) , UserException );
             ShardChunkManagerPtr empty( s.cloneMinus( min , max , 0 ) );
             ASSERT_EQUALS( empty->getVersion() , ShardChunkVersion( 0 ) );
             ASSERT_EQUALS( empty->getNumChunks() , 0u );
@@ -435,7 +435,7 @@ namespace {
 
             // we can add a chunk to an empty manager
             // version should be provided
-            ASSERT_EXCEPTION( empty->clonePlus( min , max , 0 ) , UserException );
+            ASSERT_THROWS( empty->clonePlus( min , max , 0 ) , UserException );
             ShardChunkManagerPtr cloned( empty->clonePlus( min , max , nonZero ) );
             ASSERT_EQUALS( cloned->getVersion(), nonZero );
             ASSERT_EQUALS( cloned->getNumChunks() , 1u );
diff --git a/dbtests/framework.h b/dbtests/framework.h
index 29ba58bd96b..adf610a05eb 100644
--- a/dbtests/framework.h
+++ b/dbtests/framework.h
@@ -23,7 +23,7 @@
 
 #include "../pch.h"
 
-#define ASSERT_EXCEPTION(a,b)                                       \
+#define ASSERT_THROWS(a,b)                                       \
     try {                                                           \
         a;                                                          \
         mongo::regression::assert_fail( #a , __FILE__ , __LINE__ ); \
diff --git a/dbtests/jsobjtests.cpp b/dbtests/jsobjtests.cpp
index 1c281c30f0a..709c013f6d8 100644
--- a/dbtests/jsobjtests.cpp
+++ b/dbtests/jsobjtests.cpp
@@ -1284,8 +1284,8 @@ namespace JsobjTests {
         class Unallowed {
         public:
             void run() {
-                ASSERT_EXCEPTION( BSON( GT << 4 ), MsgAssertionException );
-                ASSERT_EXCEPTION( BSON( "a" << 1 << GT << 4 ), MsgAssertionException );
+                ASSERT_THROWS( BSON( GT << 4 ), MsgAssertionException );
+                ASSERT_THROWS( BSON( "a" << 1 << GT << 4 ), MsgAssertionException );
             }
         };
 
diff --git a/dbtests/jsontests.cpp b/dbtests/jsontests.cpp
index efaee44f389..36c204a1011 100644
--- a/dbtests/jsontests.cpp
+++ b/dbtests/jsontests.cpp
@@ -101,17 +101,20 @@ namespace JsonTests {
         class InvalidNumbers {
         public:
             void run() {
-                BSONObjBuilder b;
-                b.append( "a", numeric_limits< double >::infinity() );
-                ASSERT_EXCEPTION( b.done().jsonString( Strict ), AssertionException );
-
                 BSONObjBuilder c;
                 c.append( "a", numeric_limits< double >::quiet_NaN() );
-                ASSERT_EXCEPTION( c.done().jsonString( Strict ), AssertionException );
+                string s = c.done().jsonString( Strict );
+                // Note there is no NaN in the JSON RFC but what would be the alternative?
+                ASSERT( str::contains(s, "NaN") );
+
+                // commented out assertion as it doesn't throw anymore:
+                //ASSERT_THROWS( c.done().jsonString( Strict ), AssertionException );
 
                 BSONObjBuilder d;
                 d.append( "a", numeric_limits< double >::signaling_NaN() );
-                ASSERT_EXCEPTION( d.done().jsonString( Strict ), AssertionException );
+                //ASSERT_THROWS( d.done().jsonString( Strict ), AssertionException );
+                s = d.done().jsonString( Strict );
+                ASSERT( str::contains(s, "NaN") );
             }
         };
 
@@ -424,7 +427,7 @@ namespace JsonTests {
         public:
             virtual ~Bad() {}
             void run() {
-                ASSERT_EXCEPTION( fromjson( json() ), MsgAssertionException );
+                ASSERT_THROWS( fromjson( json() ), MsgAssertionException );
             }
         protected:
             virtual string json() const = 0;
diff --git a/dbtests/namespacetests.cpp b/dbtests/namespacetests.cpp
index bbb8f5e596e..792baf2ccfa 100644
--- a/dbtests/namespacetests.cpp
+++ b/dbtests/namespacetests.cpp
@@ -45,7 +45,7 @@ namespace NamespaceTests {
             }
         protected:
             void create( bool sparse = false ) {
-                NamespaceDetailsTransient::get_w( ns() ).deletedIndex();
+                NamespaceDetailsTransient::get( ns() ).deletedIndex();
                 BSONObjBuilder builder;
                 builder.append( "ns", ns() );
                 builder.append( "name", "testIndex" );
@@ -262,7 +262,7 @@ namespace NamespaceTests {
                 b.append( "b", shortArray() );
 
                 BSONObjSet keys;
-                ASSERT_EXCEPTION( id().getKeysFromObject( b.done(), keys ),
+                ASSERT_THROWS( id().getKeysFromObject( b.done(), keys ),
                                   UserException );
             }
         private:
@@ -463,7 +463,7 @@ namespace NamespaceTests {
             void run() {
                 create();
                 BSONObjSet keys;
-                ASSERT_EXCEPTION( id().getKeysFromObject( fromjson( "{a:[{b:[1],c:[2]}]}" ), keys ),
+                ASSERT_THROWS( id().getKeysFromObject( fromjson( "{a:[{b:[1],c:[2]}]}" ), keys ),
                                   UserException );
             }
         private:
@@ -818,9 +818,9 @@ namespace NamespaceTests {
                 ASSERT_EQUALS( BSON( "" << 1 ), *keys.begin() );
                 keys.clear();
 
-                ASSERT_EXCEPTION( id().getKeysFromObject( fromjson( "{a:[{'0':1}]}" ), keys ), UserException );
+                ASSERT_THROWS( id().getKeysFromObject( fromjson( "{a:[{'0':1}]}" ), keys ), UserException );
 
-                ASSERT_EXCEPTION( id().getKeysFromObject( fromjson( "{a:[1,{'0':2}]}" ), keys ), UserException );
+                ASSERT_THROWS( id().getKeysFromObject( fromjson( "{a:[1,{'0':2}]}" ), keys ), UserException );
             }
         protected:
             BSONObj key() const { return BSON( "a.0" << 1 ); }
diff --git a/dbtests/pdfiletests.cpp b/dbtests/pdfiletests.cpp
index 26c837c7c98..e07ccb42aa6 100644
--- a/dbtests/pdfiletests.cpp
+++ b/dbtests/pdfiletests.cpp
@@ -347,7 +347,7 @@ namespace PdfileTests {
             Client::Context cx( dbname );
 
             bool isnew;
-            Database * d = dbHolder.getOrCreate( dbname , dbpath , isnew );
+            Database * d = dbHolderW().getOrCreate( dbname , dbpath , isnew );
             assert( d );
 
             int big = 10 * 1024;
diff --git a/dbtests/perftests.cpp b/dbtests/perftests.cpp
index a26b8a2d929..f188b14d2d0 100644
--- a/dbtests/perftests.cpp
+++ b/dbtests/perftests.cpp
@@ -126,29 +126,29 @@ namespace PerfTests {
         virtual string name() = 0;
 
         // how long to run test.  0 is a sentinel which means just run the timed() method once and time it.
-        virtual int howLongMillis() { return profiling ? 60000 : 5000; } 
+        virtual int howLongMillis() { return profiling ? 60000 : 5000; }
 
         /* override if your test output doesn't need that */
         virtual bool showDurStats() { return true; }
 
-        static DBClientConnection *conn;
+        static  boost::shared_ptr<DBClientConnection> conn;
         static unsigned once;
 
     public:
-        /* if you want recording of the timings, place the password for the perf database 
+        /* if you want recording of the timings, place the password for the perf database
             in ./../settings.py:
                 pstatspassword="<pwd>"
         */
-        void connect() { 
+        void connect() {
             if( once )
                 return;
             ++once;
 
             // no writing to perf db if _DEBUG
             DEV return;
-            
+
             const char *fn = "../../settings.py";
-            if( !exists(fn) ) { 
+            if( !exists(fn) ) {
                 if( exists("settings.py") )
                     fn = "settings.py";
                 else {
@@ -175,16 +175,16 @@ namespace PerfTests {
                         }
                     }
 
-                    DBClientConnection *c = new DBClientConnection(false, 0, 60);
+                    boost::shared_ptr<DBClientConnection> c(new DBClientConnection(false, 0, 60));
                     string err;
-                    if( c->connect("perfdb.10gen.cc", err) ) { 
-                        if( !c->auth("perf", "perf", pwd, err) ) { 
+                    if( c->connect("perfdb.10gen.cc", err) ) {
+                        if( !c->auth("perf", "perf", pwd, err) ) {
                             cout << "info: authentication with stats db failed: " << err << endl;
                             assert(false);
                         }
                         conn = c;
                     }
-                    else { 
+                    else {
                         cout << err << " (to log perfstats)" << endl;
                     }
                 }
@@ -203,7 +203,7 @@ namespace PerfTests {
 
             connect();
 
-            if( conn && !conn->isFailed() ) { 
+            if( conn && !conn->isFailed() ) {
                 const char *ns = "perf.pstats";
                 if( perfHist ) {
                     static bool needver = true;
@@ -215,9 +215,9 @@ namespace PerfTests {
                             b.append("host",getHostName()).append("test",s).append("dur",cmdLine.dur);
                             DEV { b.append("info.DEBUG",true); }
                             else b.appendNull("info.DEBUG");
-                            if( sizeof(int*) == 4 ) 
+                            if( sizeof(int*) == 4 )
                                 b.append("info.bits", 32);
-                            else 
+                            else
                                 b.appendNull("info.bits");
                             q = Query(b.obj()).sort("when",-1);
                         }
@@ -248,7 +248,7 @@ namespace PerfTests {
                     b.append("rps", (int) rps);
                     b.append("millis", ms);
                     b.appendBool("dur", cmdLine.dur);
-                    if( showDurStats() && cmdLine.dur ) 
+                    if( showDurStats() && cmdLine.dur )
                         b.append("durStats", dur::stats.curr->_asObj());
                     {
                         bob inf;
@@ -285,7 +285,7 @@ namespace PerfTests {
             prep();
 
             int hlm = howLongMillis();
-            DEV { 
+            DEV {
                 // don't run very long with _DEBUG - not very meaningful anyway on that build
                 hlm = min(hlm, 500);
             }
@@ -296,7 +296,7 @@ namespace PerfTests {
             n = 0;
             const unsigned Batch = batchSize();
 
-            if( hlm == 0 ) { 
+            if( hlm == 0 ) {
                 // means just do once
                 timed();
             }
@@ -346,17 +346,17 @@ namespace PerfTests {
             }
         }
 
-        void thread() { 
+        void thread() {
             DBClientType c;
             Client::initThreadIfNotAlready("perftestthr");
-            for( unsigned long long i = 0; i < n/8; i++ ) { 
+            for( unsigned long long i = 0; i < n/8; i++ ) {
                 timed2(c);
             }
             cc().shutdown();
         }
 
         void launchThreads(int remaining) {
-            if (!remaining) 
+            if (!remaining)
                 return;
             boost::thread athread(boost::bind(&B::thread, this));
             launchThreads(remaining - 1);
@@ -364,28 +364,28 @@ namespace PerfTests {
         }
     };
 
-    DBClientConnection *B::conn;
+    boost::shared_ptr<DBClientConnection> B::conn;
     unsigned B::once;
 
     unsigned dontOptimizeOutHopefully;
 
-    class NonDurTest : public B { 
+    class NonDurTest : public B {
     public:
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         virtual bool showDurStats() { return false; }
     };
 
-    class BSONIter : public NonDurTest { 
+    class BSONIter : public NonDurTest {
     public:
         int n;
         bo b, sub;
         string name() { return "BSONIter"; }
-        BSONIter() { 
+        BSONIter() {
             n = 0;
             bo sub = bob().appendTimeT("t", time(0)).appendBool("abool", true).appendBinData("somebin", 3, BinDataGeneral, "abc").appendNull("anullone").obj();
             b = BSON( "_id" << OID() << "x" << 3 << "yaaaaaa" << 3.00009 << "zz" << 1 << "q" << false << "obj" << sub << "zzzzzzz" << "a string a string" );
         }
-        void timed() { 
+        void timed() {
             for( bo::iterator i = b.begin(); i.more(); )
                 if( i.next().fieldName() )
                     n++;
@@ -395,12 +395,12 @@ namespace PerfTests {
         }
     };
 
-    class BSONGetFields1 : public NonDurTest { 
+    class BSONGetFields1 : public NonDurTest {
     public:
         int n;
         bo b, sub;
         string name() { return "BSONGetFields1By1"; }
-        BSONGetFields1() { 
+        BSONGetFields1() {
             n = 0;
             bo sub = bob().appendTimeT("t", time(0)).appendBool("abool", true).appendBinData("somebin", 3, BinDataGeneral, "abc").appendNull("anullone").obj();
             b = BSON( "_id" << OID() << "x" << 3 << "yaaaaaa" << 3.00009 << "zz" << 1 << "q" << false << "obj" << sub << "zzzzzzz" << "a string a string" );
@@ -415,7 +415,7 @@ namespace PerfTests {
         }
     };
 
-    class BSONGetFields2 : public BSONGetFields1 { 
+    class BSONGetFields2 : public BSONGetFields1 {
     public:
         string name() { return "BSONGetFields"; }
         void timed() {
@@ -431,18 +431,18 @@ namespace PerfTests {
         }
     };
 
-    class KeyTest : public B { 
+    class KeyTest : public B {
     public:
         KeyV1Owned a,b,c;
         string name() { return "Key-woequal"; }
-        virtual int howLongMillis() { return 3000; } 
-        KeyTest() : 
-          a(BSON("a"<<1<<"b"<<3.0<<"c"<<"qqq")), 
-          b(BSON("a"<<1<<"b"<<3.0<<"c"<<"qqq")), 
+        virtual int howLongMillis() { return 3000; }
+        KeyTest() :
+          a(BSON("a"<<1<<"b"<<3.0<<"c"<<"qqq")),
+          b(BSON("a"<<1<<"b"<<3.0<<"c"<<"qqq")),
           c(BSON("a"<<1<<"b"<<3.0<<"c"<<"qqqb"))
           {}
         virtual bool showDurStats() { return false; }
-        void timed() { 
+        void timed() {
             assert( a.woEqual(b) );
             assert( !a.woEqual(c) );
         }
@@ -450,10 +450,10 @@ namespace PerfTests {
 
     unsigned long long aaa;
 
-    class Timer : public B { 
+    class Timer : public B {
     public:
         string name() { return "Timer"; }
-        virtual int howLongMillis() { return 1000; } 
+        virtual int howLongMillis() { return 1000; }
         virtual bool showDurStats() { return false; }
         void timed() {
             mongo::Timer t;
@@ -461,10 +461,10 @@ namespace PerfTests {
         }
     };
 
-    class Sleep0Ms : public B { 
+    class Sleep0Ms : public B {
     public:
         string name() { return "Sleep0Ms"; }
-        virtual int howLongMillis() { return 400; } 
+        virtual int howLongMillis() { return 400; }
         virtual bool showDurStats() { return false; }
         void timed() {
             sleepmillis(0);
@@ -478,38 +478,38 @@ namespace PerfTests {
     mongo::mutex mtest("mtest");
     SpinLock s;
 
-    class mutexspeed : public B { 
+    class mutexspeed : public B {
     public:
         string name() { return "mutex"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             mongo::mutex::scoped_lock lk(mtest);
         }
-    };    
-    class simplemutexspeed : public B { 
+    };
+    class simplemutexspeed : public B {
     public:
         string name() { return "simplemutex"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             SimpleMutex::scoped_lock lk(m);
         }
-    };    
-    class spinlockspeed : public B { 
+    };
+    class spinlockspeed : public B {
     public:
         string name() { return "spinlock"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             mongo::scoped_spinlock lk(s);
         }
-    };    
+    };
     int cas;
-    class casspeed : public B { 
+    class casspeed : public B {
     public:
         string name() { return "compareandswap"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
 #ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
@@ -517,33 +517,33 @@ namespace PerfTests {
             __sync_bool_compare_and_swap(&cas, 0, 0);
 #endif
         }
-    };    
-    class rlock : public B { 
+    };
+    class rlock : public B {
     public:
         string name() { return "rlock"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             lk.lock_shared();
             lk.unlock_shared();
         }
     };
-    class wlock : public B { 
+    class wlock : public B {
     public:
         string name() { return "wlock"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             lk.lock();
             lk.unlock();
         }
     };
-    
+
 #if 0
-    class ulock : public B { 
+    class ulock : public B {
     public:
         string name() { return "ulock"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         void timed() {
             lk.lockAsUpgradable();
@@ -552,11 +552,11 @@ namespace PerfTests {
     };
 #endif
 
-    class CTM : public B { 
+    class CTM : public B {
     public:
         CTM() : last(0), delts(0), n(0) { }
         string name() { return "curTimeMillis64"; }
-        virtual int howLongMillis() { return 500; } 
+        virtual int howLongMillis() { return 500; }
         virtual bool showDurStats() { return false; }
         unsigned long long last;
         unsigned long long delts;
@@ -564,7 +564,7 @@ namespace PerfTests {
         void timed() {
             unsigned long long x = curTimeMillis64();
             aaa += x;
-            if( last ) { 
+            if( last ) {
                 unsigned long long delt = x-last;
                 if( delt ) {
                     delts += delt;
@@ -580,13 +580,13 @@ namespace PerfTests {
         }
     };
 
-    class Bldr : public B { 
+    class Bldr : public B {
     public:
         int n;
         string name() { return "BufBuilder"; }
-        Bldr() { 
+        Bldr() {
         }
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         virtual bool showDurStats() { return false; }
         void timed() {
             BufBuilder b;
@@ -597,9 +597,9 @@ namespace PerfTests {
         }
     };
 
-    class StkBldr : public B { 
+    class StkBldr : public B {
     public:
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         int n;
         string name() { return "StackBufBuilder"; }
         virtual bool showDurStats() { return false; }
@@ -616,7 +616,7 @@ namespace PerfTests {
     class Dummy : public B {
     public:
         Dummy() { }
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         string name() { return "dummy"; }
         void timed() {
             dontOptimizeOutHopefully++;
@@ -629,7 +629,7 @@ namespace PerfTests {
     __declspec( thread ) int x;
     class TLS2 : public B {
     public:
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         string name() { return "thread-local-storage2"; }
         void timed() {
             if( x )
@@ -642,7 +642,7 @@ namespace PerfTests {
     // test thread local speed
     class TLS : public B {
     public:
-        virtual int howLongMillis() { return 3000; } 
+        virtual int howLongMillis() { return 3000; }
         string name() { return "thread-local-storage"; }
         void timed() {
             if( &cc() )
@@ -653,7 +653,7 @@ namespace PerfTests {
 
     class New128 : public B {
     public:
-        virtual int howLongMillis() { return 2000; } 
+        virtual int howLongMillis() { return 2000; }
         string name() { return "new128"; }
         void timed() {
             char *p = new char[128];
@@ -665,7 +665,7 @@ namespace PerfTests {
 
     class New8 : public B {
     public:
-        virtual int howLongMillis() { return 2000; } 
+        virtual int howLongMillis() { return 2000; }
         string name() { return "new8"; }
         void timed() {
             char *p = new char[8];
@@ -683,8 +683,8 @@ namespace PerfTests {
         virtual unsigned batchSize() { return 1; }
         string name() { return "compress"; }
         virtual bool showDurStats() { return false; }
-        virtual int howLongMillis() { return 4000; } 
-        void prep() { 
+        virtual int howLongMillis() { return 4000; }
+        void prep() {
             p = malloc(sz);
             // this isn't a fair test as it is mostly rands but we just want a rough perf check
             static int last;
@@ -722,13 +722,13 @@ namespace PerfTests {
         const unsigned sz;
         ChecksumTest() : sz(1024*1024*100+3) { }
         string name() { return "checksum"; }
-        virtual int howLongMillis() { return 2000; } 
+        virtual int howLongMillis() { return 2000; }
         virtual bool showDurStats() { return false; }
         virtual unsigned batchSize() { return 1; }
 
         void *p;
 
-        void prep() { 
+        void prep() {
             {
                 // the checksum code assumes 'standard' rollover on addition overflows. let's check that:
                 unsigned long long x = 0xffffffffffffffffULL;
@@ -749,7 +749,7 @@ namespace PerfTests {
             if( i == 0 )
                 last = c;
             else if( i == 1 ) {
-                ASSERT( c == last ); 
+                ASSERT( c == last );
             }
         }
         void post() {
@@ -793,8 +793,8 @@ namespace PerfTests {
         OID oid;
         BSONObj query;
     public:
-        virtual int howLongMillis() { return 30000; } 
-        Insert1() : x( BSON("x" << 99) ) { 
+        virtual int howLongMillis() { return 30000; }
+        Insert1() : x( BSON("x" << 99) ) {
             oid.init();
             query = BSON("_id" << oid);
             i = 0;
@@ -843,7 +843,7 @@ namespace PerfTests {
 
     class InsertRandom : public B {
     public:
-        virtual int howLongMillis() { return profiling ? 30000 : 5000; } 
+        virtual int howLongMillis() { return profiling ? 30000 : 5000; }
         string name() { return "random-inserts"; }
         void prep() {
             client().insert( ns(), BSONObj() );
@@ -926,9 +926,9 @@ namespace PerfTests {
     public:
         All() : Suite( "perf" ) { }
 
-        Result * run( const string& filter ) { 
+        Result * run( const string& filter ) {
             boost::thread a(t);
-            Result * res = Suite::run(filter); 
+            Result * res = Suite::run(filter);
             a.join();
             return res;
         }
@@ -937,7 +937,7 @@ namespace PerfTests {
             cout
                 << "stats test                              rps------  time-- "
                 << dur::stats.curr->_CSVHeader() << endl;
-            if( profiling ) { 
+            if( profiling ) {
                 add< New8 >();
                 add< New128 >();
             }
diff --git a/dbtests/queryoptimizercursortests.cpp b/dbtests/queryoptimizercursortests.cpp
index 1a6cef2b426..b4f90670c41 100644
--- a/dbtests/queryoptimizercursortests.cpp
+++ b/dbtests/queryoptimizercursortests.cpp
@@ -98,14 +98,14 @@ namespace QueryOptimizerCursorTests {
             Client::Context ctx( ns() );
             shared_ptr<Cursor> c = newQueryOptimizerCursor( ns(), BSONObj() );
             ASSERT( !c->ok() );
-            ASSERT_EXCEPTION( c->_current(), AssertionException );
-            ASSERT_EXCEPTION( c->current(), AssertionException );
+            ASSERT_THROWS( c->_current(), AssertionException );
+            ASSERT_THROWS( c->current(), AssertionException );
             ASSERT( c->currLoc().isNull() );
             ASSERT( !c->advance() );
-            ASSERT_EXCEPTION( c->currKey(), AssertionException );
-            ASSERT_EXCEPTION( c->getsetdup( DiskLoc() ), AssertionException );
-            ASSERT_EXCEPTION( c->isMultiKey(), AssertionException );
-            ASSERT_EXCEPTION( c->matcher(), AssertionException );
+            ASSERT_THROWS( c->currKey(), AssertionException );
+            ASSERT_THROWS( c->getsetdup( DiskLoc() ), AssertionException );
+            ASSERT_THROWS( c->isMultiKey(), AssertionException );
+            ASSERT_THROWS( c->matcher(), AssertionException );
         }
     };
     
@@ -980,12 +980,39 @@ namespace QueryOptimizerCursorTests {
             {
                 dblock lk;
                 Client::Context ctx( ns() );
-                ASSERT_EXCEPTION( recoverFromYield(), MsgAssertionException );
+                ASSERT_THROWS( recoverFromYield(), MsgAssertionException );
                 ASSERT( !ok() );
             }                
         }
     };
     
+    /** Yield and remove document with $or query. */
+    class YieldRemoveOr : public Base {
+    public:
+        void run() {
+            _cli.insert( ns(), BSON( "_id" << 1 ) );
+            _cli.insert( ns(), BSON( "_id" << 2 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                setQueryOptimizerCursor( BSON( "$or" << BSON_ARRAY( BSON( "_id" << 1 ) << BSON( "_id" << 2 ) ) ) );
+                ASSERT_EQUALS( 1, current().getIntField( "_id" ) );
+                ASSERT( prepareToYield() );
+            }
+
+            _cli.remove( ns(), BSON( "_id" << 1 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                recoverFromYield();
+                ASSERT( ok() );
+                ASSERT_EQUALS( 2, current().getIntField( "_id" ) );
+            }
+        }
+    };
+
     /** Yield and overwrite current in capped collection. */
     class YieldCappedOverwrite : public Base {
     public:
@@ -1009,7 +1036,7 @@ namespace QueryOptimizerCursorTests {
             {
                 dblock lk;
                 Client::Context ctx( ns() );
-                ASSERT_EXCEPTION( recoverFromYield(), MsgAssertionException );
+                ASSERT_THROWS( recoverFromYield(), MsgAssertionException );
                 ASSERT( !ok() );
             }                
         }
@@ -1138,7 +1165,69 @@ namespace QueryOptimizerCursorTests {
             }                
         }
     };
+
+    /** Yielding with delete, multiple plans active, and $or clause. */
+    class YieldMultiplePlansDeleteOr : public Base {
+    public:
+        void run() {
+            _cli.insert( ns(), BSON( "_id" << 1 << "a" << 2 ) );
+            _cli.insert( ns(), BSON( "_id" << 2 << "a" << 1 ) );
+            _cli.ensureIndex( ns(), BSON( "a" << 1 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                setQueryOptimizerCursor( BSON( "$or" << BSON_ARRAY( BSON( "_id" << 1 << "a" << 2 ) << BSON( "_id" << 2 << "a" << 1 ) ) ) );
+                ASSERT_EQUALS( 1, current().getIntField( "_id" ) );
+                ASSERT( prepareToYield() );
+            }
+
+            _cli.remove( ns(), BSON( "_id" << 1 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                c()->recoverFromYield();
+                ASSERT( ok() );
+                ASSERT_EQUALS( 2, current().getIntField( "_id" ) );
+                ASSERT( !advance() );
+                ASSERT( !ok() );
+            }
+        }
+    };
     
+    /** Yielding with delete, multiple plans active with advancement to the second, and $or clause. */
+    class YieldMultiplePlansDeleteOrAdvance : public Base {
+    public:
+        void run() {
+            _cli.insert( ns(), BSON( "_id" << 1 << "a" << 2 ) );
+            _cli.insert( ns(), BSON( "_id" << 2 << "a" << 1 ) );
+            _cli.ensureIndex( ns(), BSON( "a" << 1 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                setQueryOptimizerCursor( BSON( "$or" << BSON_ARRAY( BSON( "_id" << 1 << "a" << 2 ) << BSON( "_id" << 2 << "a" << 1 ) ) ) );
+                ASSERT_EQUALS( 1, current().getIntField( "_id" ) );
+                ASSERT( prepareToYield() );
+                c()->advance();
+                ASSERT_EQUALS( 1, current().getIntField( "_id" ) );
+            }
+
+            _cli.remove( ns(), BSON( "_id" << 1 ) );
+
+            {
+                dblock lk;
+                Client::Context ctx( ns() );
+                c()->recoverFromYield();
+                ASSERT( ok() );
+                ASSERT_EQUALS( 2, current().getIntField( "_id" ) );
+                ASSERT( !advance() );
+                ASSERT( !ok() );
+            }
+        }
+    };
+
     /** Yielding with multiple plans and capped overwrite. */
     class YieldMultiplePlansCappedOverwrite : public Base {
     public:
@@ -1517,7 +1606,7 @@ namespace QueryOptimizerCursorTests {
             ASSERT( ok() );
             cc().curop()->kill();
             // First advance() call throws, subsequent calls just fail.
-            ASSERT_EXCEPTION( advance(), MsgAssertionException );
+            ASSERT_THROWS( advance(), MsgAssertionException );
             ASSERT( !advance() );
         }
     };
@@ -1535,7 +1624,7 @@ namespace QueryOptimizerCursorTests {
             ASSERT( c->ok() );
             cc().curop()->kill();
             // First advance() call throws, subsequent calls just fail.
-            ASSERT_EXCEPTION( c->advance(), MsgAssertionException );
+            ASSERT_THROWS( c->advance(), MsgAssertionException );
             ASSERT( !c->advance() );
         }
     };
@@ -1728,11 +1817,14 @@ namespace QueryOptimizerCursorTests {
             add<QueryOptimizerCursorTests::YieldUpdate>();
             add<QueryOptimizerCursorTests::YieldDrop>();
             add<QueryOptimizerCursorTests::YieldDropOr>();
+            add<QueryOptimizerCursorTests::YieldRemoveOr>();
             add<QueryOptimizerCursorTests::YieldCappedOverwrite>();
             add<QueryOptimizerCursorTests::YieldDropIndex>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansNoOp>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansAdvanceNoOp>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansDelete>();
+            add<QueryOptimizerCursorTests::YieldMultiplePlansDeleteOr>();
+            add<QueryOptimizerCursorTests::YieldMultiplePlansDeleteOrAdvance>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansCappedOverwrite>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansCappedOverwriteManual>();
             add<QueryOptimizerCursorTests::YieldMultiplePlansCappedOverwriteManual2>();
diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
index 4d182b2dea5..33fbc49bdba 100644
--- a/dbtests/queryoptimizertests.cpp
+++ b/dbtests/queryoptimizertests.cpp
@@ -470,7 +470,7 @@ namespace QueryOptimizerTests {
                 BSONElement e = b.firstElement();
                 auto_ptr< FieldRangeSetPair > frsp( new FieldRangeSetPair( ns(), BSON( "a" << 1 ) ) );
                 auto_ptr< FieldRangeSetPair > frspOrig( new FieldRangeSetPair( *frsp ) );
-                ASSERT_EXCEPTION( QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), BSON( "b" << 1 ), true, &e ),
+                ASSERT_THROWS( QueryPlanSet s( ns(), frsp, frspOrig, BSON( "a" << 1 ), BSON( "b" << 1 ), true, &e ),
                                   AssertionException );
             }
         };
@@ -750,7 +750,7 @@ namespace QueryOptimizerTests {
                 theDataFileMgr.insertWithObjMod( ns(), one );
                 BSONObj result;
                 ASSERT( Helpers::findOne( ns(), BSON( "a" << 1 ), result ) );
-                ASSERT_EXCEPTION( Helpers::findOne( ns(), BSON( "a" << 1 ), result, true ), AssertionException );
+                ASSERT_THROWS( Helpers::findOne( ns(), BSON( "a" << 1 ), result, true ), AssertionException );
                 Helpers::ensureIndex( ns(), BSON( "a" << 1 ), false, "a_1" );
                 ASSERT( Helpers::findOne( ns(), BSON( "a" << 1 ), result, true ) );
             }
@@ -970,7 +970,7 @@ namespace QueryOptimizerTests {
     class BestGuessOrSortAssertion : public Base {
     public:
         void run() {
-            ASSERT_EXCEPTION( bestGuessCursor( ns(), BSON( "$or" << BSON_ARRAY( BSON( "b" << 1 ) ) ), BSON( "a" << 1 ) ), MsgAssertionException );
+            ASSERT_THROWS( bestGuessCursor( ns(), BSON( "$or" << BSON_ARRAY( BSON( "b" << 1 ) ) ), BSON( "a" << 1 ) ), MsgAssertionException );
         }
     };
     
diff --git a/dbtests/repltests.cpp b/dbtests/repltests.cpp
index 8e264175737..86288ad9426 100644
--- a/dbtests/repltests.cpp
+++ b/dbtests/repltests.cpp
@@ -109,12 +109,6 @@ namespace ReplTests {
             return count;
         }
         static void applyAllOperations() {
-            class Applier : public ReplSource {
-            public:
-                static void apply( const BSONObj &op ) {
-                    ReplSource::applyOperation( op );
-                }
-            };
             dblock lk;
             vector< BSONObj > ops;
             {
@@ -124,8 +118,13 @@ namespace ReplTests {
             }
             {
                 Client::Context ctx( ns() );
-                for( vector< BSONObj >::iterator i = ops.begin(); i != ops.end(); ++i )
-                    Applier::apply( *i );
+                BSONObjBuilder b;
+                b.append("host", "localhost");
+                b.appendTimestamp("syncedTo", 0);
+                ReplSource a(b.obj());
+                for( vector< BSONObj >::iterator i = ops.begin(); i != ops.end(); ++i ) {
+                    a.applyOperation( *i );
+                }
             }
         }
         static void printAll( const char *ns ) {
@@ -1016,7 +1015,7 @@ namespace ReplTests {
             ASSERT( !one( BSON( "_id" << 2 ) ).isEmpty() );
         }
     };
-    
+
     class DatabaseIgnorerBasic {
     public:
         void run() {
@@ -1049,10 +1048,10 @@ namespace ReplTests {
             d.doIgnoreUntilAfter( "a", OpTime( 5, 0 ) );
             ASSERT( d.ignoreAt( "a", OpTime( 5, 5 ) ) );
             ASSERT( d.ignoreAt( "a", OpTime( 6, 0 ) ) );
-            ASSERT( !d.ignoreAt( "a", OpTime( 6, 1 ) ) );            
+            ASSERT( !d.ignoreAt( "a", OpTime( 6, 1 ) ) );
         }
     };
-    
+
     /**
      * Check against oldest document in the oplog before scanning backward
      * from the newest document.
@@ -1077,7 +1076,7 @@ namespace ReplTests {
             ASSERT_EQUALS( 0, fsc.cursor()->current()[ "o" ].Obj()[ "_id" ].Int() );
         }
     };
-    
+
     /** Check unsuccessful yield recovery with FindingStartCursor */
     class FindingStartCursorYield : public Base {
     public:
@@ -1100,7 +1099,7 @@ namespace ReplTests {
             ASSERT( !fsc.done() );
             ASSERT( fsc.prepareToYield() );
             ClientCursor::invalidate( "local.oplog.$main" );
-            ASSERT_EXCEPTION( fsc.recoverFromYield(), MsgAssertionException );
+            ASSERT_THROWS( fsc.recoverFromYield(), MsgAssertionException );
         }
     };
 
@@ -1123,6 +1122,47 @@ namespace ReplTests {
         }
     };
 
+    class SyncTest : public Sync {
+    public:
+        bool returnEmpty;
+        SyncTest() : Sync(""), returnEmpty(false) {}
+        virtual ~SyncTest() {}
+        virtual BSONObj getMissingDoc(const BSONObj& o) {
+            if (returnEmpty) {
+                BSONObj o;
+                return o;
+            }
+            return BSON("_id" << "on remote" << "foo" << "baz");
+        }
+    };
+
+    class ShouldRetry : public Base {
+    public:
+        void run() {
+            bool threw = false;
+            BSONObj o = BSON("ns" << ns() << "o" << BSON("foo" << "bar") << "o2" << BSON("_id" << "in oplog" << "foo" << "bar"));
+
+            // this should fail because we can't connect
+            try {
+                Sync badSource("localhost:123");
+                badSource.getMissingDoc(o);
+            }
+            catch (DBException&) {
+                threw = true;
+            }
+            assert(threw);
+
+            // now this should succeed
+            SyncTest t;
+            assert(t.shouldRetry(o));
+            assert(!client()->findOne(ns(), BSON("_id" << "on remote")).isEmpty());
+
+            // force it not to find an obj
+            t.returnEmpty = true;
+            assert(!t.shouldRetry(o));
+        }
+    };
+
     class All : public Suite {
     public:
         All() : Suite( "repl" ) {
@@ -1180,6 +1220,7 @@ namespace ReplTests {
             add< FindingStartCursorStale >();
             add< FindingStartCursorYield >();
             add< ReplSetMemberCfgEquality >();
+            add< ShouldRetry >();
         }
     } myall;
 
diff --git a/dbtests/test.vcxproj b/dbtests/test.vcxproj
index ec7f95779af..5c7a3e21fca 100644
--- a/dbtests/test.vcxproj
+++ b/dbtests/test.vcxproj
@@ -1,734 +1,761 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{215B2D68-0A70-4D10-8E75-B33010C62A91}</ProjectGuid>
-    <RootNamespace>dbtests</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>No</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <Profile>true</Profile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DURABLE;_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4800;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>No</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>No</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4355;4800;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimalRebuild>No</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\config\auto_link.hpp" />
-    <ClInclude Include="..\bson\bson-inl.h" />
-    <ClInclude Include="..\bson\bson.h" />
-    <ClInclude Include="..\bson\bsonelement.h" />
-    <ClInclude Include="..\bson\bsonmisc.h" />
-    <ClInclude Include="..\bson\bsonobj.h" />
-    <ClInclude Include="..\bson\bsonobjbuilder.h" />
-    <ClInclude Include="..\bson\bsonobjiterator.h" />
-    <ClInclude Include="..\bson\bsontypes.h" />
-    <ClInclude Include="..\bson\bson_db.h" />
-    <ClInclude Include="..\bson\inline_decls.h" />
-    <ClInclude Include="..\bson\oid.h" />
-    <ClInclude Include="..\bson\ordering.h" />
-    <ClInclude Include="..\bson\stringdata.h" />
-    <ClInclude Include="..\db\dur.h" />
-    <ClInclude Include="..\db\durop.h" />
-    <ClInclude Include="..\db\dur_journal.h" />
-    <ClInclude Include="..\db\jsobjmanipulator.h" />
-    <ClInclude Include="..\db\mongommf.h" />
-    <ClInclude Include="..\db\mongomutex.h" />
-    <ClInclude Include="..\db\ops\delete.h" />
-    <ClInclude Include="..\db\ops\query.h" />
-    <ClInclude Include="..\db\ops\update.h" />
-    <ClInclude Include="..\third_party\pcre-7.4\pcrecpp.h" />
-    <ClInclude Include="..\server.h" />
-    <ClInclude Include="..\targetver.h" />
-    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\version.hpp" />
-    <ClInclude Include="..\third_party\pcre-7.4\config.h" />
-    <ClInclude Include="..\third_party\pcre-7.4\pcre.h" />
-    <ClInclude Include="..\client\connpool.h" />
-    <ClInclude Include="..\client\dbclient.h" />
-    <ClInclude Include="..\client\model.h" />
-    <ClInclude Include="..\db\btree.h" />
-    <ClInclude Include="..\db\clientcursor.h" />
-    <ClInclude Include="..\db\cmdline.h" />
-    <ClInclude Include="..\db\commands.h" />
-    <ClInclude Include="..\db\concurrency.h" />
-    <ClInclude Include="..\db\curop.h" />
-    <ClInclude Include="..\db\cursor.h" />
-    <ClInclude Include="..\db\database.h" />
-    <ClInclude Include="..\db\db.h" />
-    <ClInclude Include="..\db\dbhelpers.h" />
-    <ClInclude Include="..\db\dbinfo.h" />
-    <ClInclude Include="..\db\dbmessage.h" />
-    <ClInclude Include="..\db\diskloc.h" />
-    <ClInclude Include="..\db\extsort.h" />
-    <ClInclude Include="..\db\introspect.h" />
-    <ClInclude Include="..\db\jsobj.h" />
-    <ClInclude Include="..\db\json.h" />
-    <ClInclude Include="..\db\matcher.h" />
-    <ClInclude Include="..\grid\message.h" />
-    <ClInclude Include="..\db\minilex.h" />
-    <ClInclude Include="..\db\namespace.h" />
-    <ClInclude Include="..\pch.h" />
-    <ClInclude Include="..\db\pdfile.h" />
-    <ClInclude Include="..\grid\protocol.h" />
-    <ClInclude Include="..\db\query.h" />
-    <ClInclude Include="..\db\queryoptimizer.h" />
-    <ClInclude Include="..\db\repl.h" />
-    <ClInclude Include="..\db\replset.h" />
-    <ClInclude Include="..\db\resource.h" />
-    <ClInclude Include="..\db\scanandorder.h" />
-    <ClInclude Include="..\db\security.h" />
-    <ClInclude Include="..\third_party\snappy\config.h" />
-    <ClInclude Include="..\third_party\snappy\snappy-c.h" />
-    <ClInclude Include="..\third_party\snappy\snappy-internal.h" />
-    <ClInclude Include="..\third_party\snappy\snappy-sinksource.h" />
-    <ClInclude Include="..\third_party\snappy\snappy-stubs-internal.h" />
-    <ClInclude Include="..\third_party\snappy\snappy-stubs-public.h" />
-    <ClInclude Include="..\third_party\snappy\snappy.h" />
-    <ClInclude Include="..\util\builder.h" />
-    <ClInclude Include="..\util\checksum.h" />
-    <ClInclude Include="..\util\compress.h" />
-    <ClInclude Include="..\util\concurrency\list.h" />
-    <ClInclude Include="..\util\concurrency\task.h" />
-    <ClInclude Include="..\util\concurrency\value.h" />
-    <ClInclude Include="..\util\file.h" />
-    <ClInclude Include="..\util\goodies.h" />
-    <ClInclude Include="..\util\hashtab.h" />
-    <ClInclude Include="..\db\lasterror.h" />
-    <ClInclude Include="..\util\log.h" />
-    <ClInclude Include="..\util\logfile.h" />
-    <ClInclude Include="..\util\lruishmap.h" />
-    <ClInclude Include="..\util\md5.h" />
-    <ClInclude Include="..\util\md5.hpp" />
-    <ClInclude Include="..\util\miniwebserver.h" />
-    <ClInclude Include="..\util\mmap.h" />
-    <ClInclude Include="..\util\mongoutils\hash.h" />
-    <ClInclude Include="..\util\sock.h" />
-    <ClInclude Include="..\util\unittest.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\bson\oid.cpp" />
-    <ClCompile Include="..\client\dbclientcursor.cpp" />
-    <ClCompile Include="..\client\dbclient_rs.cpp" />
-    <ClCompile Include="..\client\distlock.cpp" />
-    <ClCompile Include="..\client\gridfs.cpp" />
-    <ClCompile Include="..\client\model.cpp" />
-    <ClCompile Include="..\client\parallel.cpp" />
-    <ClCompile Include="..\db\btreebuilder.cpp" />
-    <ClCompile Include="..\db\cap.cpp" />
-    <ClCompile Include="..\db\commands\isself.cpp" />
-    <ClCompile Include="..\db\compact.cpp" />
-    <ClCompile Include="..\db\dbcommands_admin.cpp" />
-    <ClCompile Include="..\db\dbcommands_generic.cpp" />
-    <ClCompile Include="..\db\dur.cpp" />
-    <ClCompile Include="..\db\durop.cpp" />
-    <ClCompile Include="..\db\dur_commitjob.cpp" />
-    <ClCompile Include="..\db\dur_journal.cpp" />
-    <ClCompile Include="..\db\dur_preplogbuffer.cpp" />
-    <ClCompile Include="..\db\dur_recover.cpp" />
-    <ClCompile Include="..\db\dur_writetodatafiles.cpp" />
-    <ClCompile Include="..\db\geo\2d.cpp" />
-    <ClCompile Include="..\db\geo\haystack.cpp" />
-    <ClCompile Include="..\db\key.cpp" />
-    <ClCompile Include="..\db\mongommf.cpp" />
-    <ClCompile Include="..\db\ops\delete.cpp" />
-    <ClCompile Include="..\db\ops\query.cpp" />
-    <ClCompile Include="..\db\ops\update.cpp" />
-    <ClCompile Include="..\db\projection.cpp" />
-    <ClCompile Include="..\db\queryoptimizercursor.cpp" />
-    <ClCompile Include="..\db\querypattern.cpp">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\db\record.cpp" />
-    <ClCompile Include="..\db\repl\consensus.cpp" />
-    <ClCompile Include="..\db\repl\heartbeat.cpp" />
-    <ClCompile Include="..\db\repl\manager.cpp" />
-    <ClCompile Include="..\db\repl\rs.cpp" />
-    <ClCompile Include="..\db\repl\rs_initialsync.cpp" />
-    <ClCompile Include="..\db\repl\rs_initiate.cpp" />
-    <ClCompile Include="..\db\repl\rs_rollback.cpp" />
-    <ClCompile Include="..\db\repl\rs_sync.cpp" />
-    <ClCompile Include="..\db\restapi.cpp" />
-    <ClCompile Include="..\db\scanandorder.cpp" />
-    <ClCompile Include="..\db\security_common.cpp" />
-    <ClCompile Include="..\third_party\pcre-7.4\pcrecpp.cc">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_chartables.c">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_compile.c">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_config.c">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_dfa_exec.c">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_exec.c">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_fullinfo.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_get.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_globals.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_info.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_maketables.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_newline.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_ord2utf8.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_refcount.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_scanner.cc">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_stringpiece.cc">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_study.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_tables.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_try_flipped.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_ucp_searchfuncs.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_valid_utf8.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_version.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcre_xclass.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\pcre-7.4\pcreposix.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\client\connpool.cpp" />
-    <ClCompile Include="..\client\dbclient.cpp" />
-    <ClCompile Include="..\client\syncclusterconnection.cpp" />
-    <ClCompile Include="..\db\btree.cpp" />
-    <ClCompile Include="..\db\btreecursor.cpp" />
-    <ClCompile Include="..\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\db\client.cpp" />
-    <ClCompile Include="..\db\clientcursor.cpp" />
-    <ClCompile Include="..\db\cloner.cpp" />
-    <ClCompile Include="..\db\commands\cloud.cpp">
-      <PrecompiledHeader />
-    </ClCompile>
-    <ClCompile Include="..\db\commands.cpp" />
-    <ClCompile Include="..\db\common.cpp" />
-    <ClCompile Include="..\db\cursor.cpp" />
-    <ClCompile Include="..\db\database.cpp" />
-    <ClCompile Include="..\db\dbcommands.cpp" />
-    <ClCompile Include="..\db\dbeval.cpp" />
-    <ClCompile Include="..\db\dbhelpers.cpp" />
-    <ClCompile Include="..\db\dbwebserver.cpp" />
-    <ClCompile Include="..\db\extsort.cpp" />
-    <ClCompile Include="..\db\index.cpp" />
-    <ClCompile Include="..\db\indexkey.cpp" />
-    <ClCompile Include="..\db\instance.cpp" />
-    <ClCompile Include="..\db\introspect.cpp" />
-    <ClCompile Include="..\db\jsobj.cpp" />
-    <ClCompile Include="..\db\json.cpp" />
-    <ClCompile Include="..\db\lasterror.cpp" />
-    <ClCompile Include="..\db\matcher.cpp" />
-    <ClCompile Include="..\scripting\bench.cpp" />
-    <ClCompile Include="..\s\chunk.cpp" />
-    <ClCompile Include="..\s\config.cpp" />
-    <ClCompile Include="..\s\d_chunk_manager.cpp" />
-    <ClCompile Include="..\s\d_migrate.cpp" />
-    <ClCompile Include="..\s\d_split.cpp" />
-    <ClCompile Include="..\s\d_state.cpp" />
-    <ClCompile Include="..\s\d_writeback.cpp" />
-    <ClCompile Include="..\s\grid.cpp" />
-    <ClCompile Include="..\s\shard.cpp" />
-    <ClCompile Include="..\s\shardconnection.cpp" />
-    <ClCompile Include="..\s\shardkey.cpp" />
-    <ClCompile Include="..\third_party\snappy\snappy-sinksource.cc">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\third_party\snappy\snappy.cc">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\util\alignedbuilder.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\util\compress.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\util\concurrency\spin_lock.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\util\concurrency\synchronization.cpp" />
-    <ClCompile Include="..\util\concurrency\task.cpp" />
-    <ClCompile Include="..\util\concurrency\thread_pool.cpp" />
-    <ClCompile Include="..\util\concurrency\vars.cpp" />
-    <ClCompile Include="..\util\file_allocator.cpp" />
-    <ClCompile Include="..\util\log.cpp" />
-    <ClCompile Include="..\util\logfile.cpp" />
-    <ClCompile Include="..\util\mmap_win.cpp" />
-    <ClCompile Include="..\db\namespace.cpp" />
-    <ClCompile Include="..\db\nonce.cpp" />
-    <ClCompile Include="..\db\pdfile.cpp" />
-    <ClCompile Include="..\db\queryoptimizer.cpp" />
-    <ClCompile Include="..\util\processinfo.cpp" />
-    <ClCompile Include="..\db\repl.cpp" />
-    <ClCompile Include="..\db\security.cpp" />
-    <ClCompile Include="..\db\security_commands.cpp" />
-    <ClCompile Include="..\db\tests.cpp" />
-    <ClCompile Include="..\db\cmdline.cpp" />
-    <ClCompile Include="..\db\dbmessage.cpp" />
-    <ClCompile Include="..\db\matcher_covered.cpp" />
-    <ClCompile Include="..\db\oplog.cpp" />
-    <ClCompile Include="..\db\queryutil.cpp" />
-    <ClCompile Include="..\db\repl_block.cpp" />
-    <ClCompile Include="..\util\assert_util.cpp" />
-    <ClCompile Include="..\util\background.cpp" />
-    <ClCompile Include="..\util\base64.cpp" />
-    <ClCompile Include="..\util\md5.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="..\util\md5main.cpp" />
-    <ClCompile Include="..\util\net\message.cpp" />
-    <ClCompile Include="..\util\net\listen.cpp" />
-    <ClCompile Include="..\util\net\message_server_port.cpp" />
-    <ClCompile Include="..\util\net\message_port.cpp" />
-    <ClCompile Include="..\util\net\miniwebserver.cpp" />
-    <ClCompile Include="..\util\mmap.cpp" />
-    <ClCompile Include="..\util\processinfo_win32.cpp" />
-    <ClCompile Include="..\util\ramlog.cpp" />
-    <ClCompile Include="..\util\net\sock.cpp" />
-    <ClCompile Include="..\util\stringutils.cpp" />
-    <ClCompile Include="..\util\text.cpp" />
-    <ClCompile Include="..\util\util.cpp" />
-    <ClCompile Include="..\s\d_logic.cpp" />
-    <ClCompile Include="..\scripting\engine.cpp" />
-    <ClCompile Include="..\scripting\engine_spidermonkey.cpp" />
-    <ClCompile Include="..\shell\mongo_vstudio.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\scripting\utils.cpp" />
-    <ClCompile Include="..\util\version.cpp" />
-    <ClCompile Include="basictests.cpp" />
-    <ClCompile Include="btreetests.cpp" />
-    <ClCompile Include="clienttests.cpp" />
-    <ClCompile Include="cursortests.cpp" />
-    <ClCompile Include="dbtests.cpp" />
-    <ClCompile Include="directclienttests.cpp" />
-    <ClCompile Include="framework.cpp" />
-    <ClCompile Include="jsobjtests.cpp" />
-    <ClCompile Include="jsontests.cpp" />
-    <ClCompile Include="jstests.cpp" />
-    <ClCompile Include="matchertests.cpp" />
-    <ClCompile Include="mmaptests.cpp" />
-    <ClCompile Include="namespacetests.cpp" />
-    <ClCompile Include="pdfiletests.cpp" />
-    <ClCompile Include="perftests.cpp" />
-    <ClCompile Include="queryoptimizertests.cpp" />
-    <ClCompile Include="querytests.cpp" />
-    <ClCompile Include="repltests.cpp" />
-    <ClCompile Include="socktests.cpp" />
-    <ClCompile Include="spin_lock_test.cpp" />
-    <ClCompile Include="threadedtests.cpp">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4180;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4180;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ClCompile Include="updatetests.cpp" />
-    <ClCompile Include="..\db\stats\counters.cpp" />
-    <ClCompile Include="..\db\stats\snapshots.cpp" />
-    <ClCompile Include="..\db\stats\top.cpp" />
-    <ClCompile Include="..\db\repl\health.cpp" />
-    <ClCompile Include="..\db\repl\replset_commands.cpp" />
-    <ClCompile Include="..\db\repl\rs_config.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\SConstruct" />
-    <None Include="btreetests.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\js\js32d.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="..\..\js\js32r.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="..\..\js\js64d.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="..\..\js\js64r.lib">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </Library>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{215B2D68-0A70-4D10-8E75-B33010C62A91}</ProjectGuid>

+    <RootNamespace>dbtests</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <UseOfAtl>false</UseOfAtl>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;$(IncludePath)</IncludePath>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;$(IncludePath)</IncludePath>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..;$(IncludePath)</IncludePath>

+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..;$(IncludePath)</IncludePath>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>No</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4355;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib</AdditionalLibraryDirectories>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+      <Profile>true</Profile>

+    </Link>

+    <PreBuildEvent>

+      <Command>cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>

+      <Message>Create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DURABLE;_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4355;4800;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <MinimalRebuild>No</MinimalRebuild>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib</AdditionalLibraryDirectories>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+    </Link>

+    <PreBuildEvent>

+      <Command>cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>

+      <Message>Create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4355;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <MinimalRebuild>No</MinimalRebuild>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_32;\boost\lib\vs2010_32;\boost\lib</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <PreBuildEvent>

+      <Command>cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>

+      <Message>Create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>..\..\js\src;..\third_party\pcre-7.4;C:\boost;\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_UNICODE;UNICODE;MONGO_EXPOSE_MACROS;OLDJS;STATIC_JS_API;XP_WIN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <DisableSpecificWarnings>4355;4800;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <MinimalRebuild>No</MinimalRebuild>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>ws2_32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>c:\boost\lib\vs2010_64;\boost\lib\vs2010_64;\boost\lib</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+    </Link>

+    <PreBuildEvent>

+      <Command>cscript //Nologo ..\shell\msvc\createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>

+      <Message>Create mongo.cpp and mongo-server.cpp from JavaScript source files</Message>

+    </PreBuildEvent>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\config\auto_link.hpp" />

+    <ClInclude Include="..\bson\bson-inl.h" />

+    <ClInclude Include="..\bson\bson.h" />

+    <ClInclude Include="..\bson\bsonelement.h" />

+    <ClInclude Include="..\bson\bsonmisc.h" />

+    <ClInclude Include="..\bson\bsonobj.h" />

+    <ClInclude Include="..\bson\bsonobjbuilder.h" />

+    <ClInclude Include="..\bson\bsonobjiterator.h" />

+    <ClInclude Include="..\bson\bsontypes.h" />

+    <ClInclude Include="..\bson\bson_db.h" />

+    <ClInclude Include="..\bson\inline_decls.h" />

+    <ClInclude Include="..\bson\oid.h" />

+    <ClInclude Include="..\bson\ordering.h" />

+    <ClInclude Include="..\bson\stringdata.h" />

+    <ClInclude Include="..\db\collection.h" />

+    <ClInclude Include="..\db\databaseholder.h" />

+    <ClInclude Include="..\db\dur.h" />

+    <ClInclude Include="..\db\durop.h" />

+    <ClInclude Include="..\db\dur_journal.h" />

+    <ClInclude Include="..\db\jsobjmanipulator.h" />

+    <ClInclude Include="..\db\mongommf.h" />

+    <ClInclude Include="..\db\mongomutex.h" />

+    <ClInclude Include="..\db\ops\delete.h" />

+    <ClInclude Include="..\db\ops\query.h" />

+    <ClInclude Include="..\db\ops\update.h" />

+    <ClInclude Include="..\third_party\pcre-7.4\pcrecpp.h" />

+    <ClInclude Include="..\server.h" />

+    <ClInclude Include="..\targetver.h" />

+    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\version.hpp" />

+    <ClInclude Include="..\third_party\pcre-7.4\config.h" />

+    <ClInclude Include="..\third_party\pcre-7.4\pcre.h" />

+    <ClInclude Include="..\client\connpool.h" />

+    <ClInclude Include="..\client\dbclient.h" />

+    <ClInclude Include="..\client\model.h" />

+    <ClInclude Include="..\db\btree.h" />

+    <ClInclude Include="..\db\clientcursor.h" />

+    <ClInclude Include="..\db\cmdline.h" />

+    <ClInclude Include="..\db\commands.h" />

+    <ClInclude Include="..\db\concurrency.h" />

+    <ClInclude Include="..\db\curop.h" />

+    <ClInclude Include="..\db\cursor.h" />

+    <ClInclude Include="..\db\database.h" />

+    <ClInclude Include="..\db\db.h" />

+    <ClInclude Include="..\db\dbhelpers.h" />

+    <ClInclude Include="..\db\dbinfo.h" />

+    <ClInclude Include="..\db\dbmessage.h" />

+    <ClInclude Include="..\db\diskloc.h" />

+    <ClInclude Include="..\db\extsort.h" />

+    <ClInclude Include="..\db\introspect.h" />

+    <ClInclude Include="..\db\jsobj.h" />

+    <ClInclude Include="..\db\json.h" />

+    <ClInclude Include="..\db\matcher.h" />

+    <ClInclude Include="..\grid\message.h" />

+    <ClInclude Include="..\db\minilex.h" />

+    <ClInclude Include="..\db\namespace.h" />

+    <ClInclude Include="..\pch.h" />

+    <ClInclude Include="..\db\pdfile.h" />

+    <ClInclude Include="..\grid\protocol.h" />

+    <ClInclude Include="..\db\query.h" />

+    <ClInclude Include="..\db\queryoptimizer.h" />

+    <ClInclude Include="..\db\repl.h" />

+    <ClInclude Include="..\db\replset.h" />

+    <ClInclude Include="..\db\resource.h" />

+    <ClInclude Include="..\db\scanandorder.h" />

+    <ClInclude Include="..\db\security.h" />

+    <ClInclude Include="..\third_party\snappy\config.h" />

+    <ClInclude Include="..\third_party\snappy\snappy-c.h" />

+    <ClInclude Include="..\third_party\snappy\snappy-internal.h" />

+    <ClInclude Include="..\third_party\snappy\snappy-sinksource.h" />

+    <ClInclude Include="..\third_party\snappy\snappy-stubs-internal.h" />

+    <ClInclude Include="..\third_party\snappy\snappy-stubs-public.h" />

+    <ClInclude Include="..\third_party\snappy\snappy.h" />

+    <ClInclude Include="..\util\builder.h" />

+    <ClInclude Include="..\util\checksum.h" />

+    <ClInclude Include="..\util\compress.h" />

+    <ClInclude Include="..\util\concurrency\list.h" />

+    <ClInclude Include="..\util\concurrency\task.h" />

+    <ClInclude Include="..\util\concurrency\value.h" />

+    <ClInclude Include="..\util\file.h" />

+    <ClInclude Include="..\util\goodies.h" />

+    <ClInclude Include="..\util\hashtab.h" />

+    <ClInclude Include="..\db\lasterror.h" />

+    <ClInclude Include="..\util\log.h" />

+    <ClInclude Include="..\util\logfile.h" />

+    <ClInclude Include="..\util\lruishmap.h" />

+    <ClInclude Include="..\util\md5.h" />

+    <ClInclude Include="..\util\md5.hpp" />

+    <ClInclude Include="..\util\miniwebserver.h" />

+    <ClInclude Include="..\util\mmap.h" />

+    <ClInclude Include="..\util\mongoutils\hash.h" />

+    <ClInclude Include="..\util\sock.h" />

+    <ClInclude Include="..\util\unittest.h" />

+    <ClInclude Include="framework.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\bson\oid.cpp" />

+    <ClCompile Include="..\client\dbclientcursor.cpp" />

+    <ClCompile Include="..\client\dbclient_rs.cpp" />

+    <ClCompile Include="..\client\distlock.cpp" />

+    <ClCompile Include="..\client\gridfs.cpp" />

+    <ClCompile Include="..\client\model.cpp" />

+    <ClCompile Include="..\client\parallel.cpp" />

+    <ClCompile Include="..\db\btreebuilder.cpp" />

+    <ClCompile Include="..\db\cap.cpp" />

+    <ClCompile Include="..\db\commands\isself.cpp" />

+    <ClCompile Include="..\db\compact.cpp" />

+    <ClCompile Include="..\db\dbcommands_admin.cpp" />

+    <ClCompile Include="..\db\dbcommands_generic.cpp" />

+    <ClCompile Include="..\db\dur.cpp" />

+    <ClCompile Include="..\db\durop.cpp" />

+    <ClCompile Include="..\db\dur_commitjob.cpp" />

+    <ClCompile Include="..\db\dur_journal.cpp" />

+    <ClCompile Include="..\db\dur_preplogbuffer.cpp" />

+    <ClCompile Include="..\db\dur_recover.cpp" />

+    <ClCompile Include="..\db\dur_writetodatafiles.cpp" />

+    <ClCompile Include="..\db\d_concurrency.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\db\geo\2d.cpp" />

+    <ClCompile Include="..\db\geo\haystack.cpp" />

+    <ClCompile Include="..\db\key.cpp" />

+    <ClCompile Include="..\db\mongommf.cpp" />

+    <ClCompile Include="..\db\ops\delete.cpp" />

+    <ClCompile Include="..\db\ops\query.cpp" />

+    <ClCompile Include="..\db\ops\update.cpp" />

+    <ClCompile Include="..\db\projection.cpp" />

+    <ClCompile Include="..\db\queryoptimizercursor.cpp" />

+    <ClCompile Include="..\db\querypattern.cpp">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\db\record.cpp" />

+    <ClCompile Include="..\db\repl\consensus.cpp" />

+    <ClCompile Include="..\db\repl\heartbeat.cpp" />

+    <ClCompile Include="..\db\repl\manager.cpp" />

+    <ClCompile Include="..\db\repl\rs.cpp" />

+    <ClCompile Include="..\db\repl\rs_initialsync.cpp" />

+    <ClCompile Include="..\db\repl\rs_initiate.cpp" />

+    <ClCompile Include="..\db\repl\rs_rollback.cpp" />

+    <ClCompile Include="..\db\repl\rs_sync.cpp" />

+    <ClCompile Include="..\db\restapi.cpp" />

+    <ClCompile Include="..\db\scanandorder.cpp" />

+    <ClCompile Include="..\db\security_common.cpp" />

+    <ClCompile Include="..\third_party\pcre-7.4\pcrecpp.cc">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_chartables.c">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_compile.c">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_config.c">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_dfa_exec.c">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_exec.c">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_fullinfo.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_get.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_globals.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_info.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_maketables.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_newline.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_ord2utf8.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_refcount.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_scanner.cc">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_stringpiece.cc">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_study.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_tables.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_try_flipped.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_ucp_searchfuncs.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_valid_utf8.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_version.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcre_xclass.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\pcre-7.4\pcreposix.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\client\connpool.cpp" />

+    <ClCompile Include="..\client\dbclient.cpp" />

+    <ClCompile Include="..\client\syncclusterconnection.cpp" />

+    <ClCompile Include="..\db\btree.cpp" />

+    <ClCompile Include="..\db\btreecursor.cpp" />

+    <ClCompile Include="..\pch.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\db\client.cpp" />

+    <ClCompile Include="..\db\clientcursor.cpp" />

+    <ClCompile Include="..\db\cloner.cpp" />

+    <ClCompile Include="..\db\commands\cloud.cpp">

+      <PrecompiledHeader />

+    </ClCompile>

+    <ClCompile Include="..\db\commands.cpp" />

+    <ClCompile Include="..\db\common.cpp" />

+    <ClCompile Include="..\db\cursor.cpp" />

+    <ClCompile Include="..\db\database.cpp" />

+    <ClCompile Include="..\db\dbcommands.cpp" />

+    <ClCompile Include="..\db\dbeval.cpp" />

+    <ClCompile Include="..\db\dbhelpers.cpp" />

+    <ClCompile Include="..\db\dbwebserver.cpp" />

+    <ClCompile Include="..\db\extsort.cpp" />

+    <ClCompile Include="..\db\index.cpp" />

+    <ClCompile Include="..\db\indexkey.cpp" />

+    <ClCompile Include="..\db\instance.cpp" />

+    <ClCompile Include="..\db\introspect.cpp" />

+    <ClCompile Include="..\db\jsobj.cpp" />

+    <ClCompile Include="..\db\json.cpp" />

+    <ClCompile Include="..\db\lasterror.cpp" />

+    <ClCompile Include="..\db\matcher.cpp" />

+    <ClCompile Include="..\scripting\bench.cpp" />

+    <ClCompile Include="..\s\chunk.cpp" />

+    <ClCompile Include="..\s\config.cpp" />

+    <ClCompile Include="..\s\d_chunk_manager.cpp" />

+    <ClCompile Include="..\s\d_migrate.cpp" />

+    <ClCompile Include="..\s\d_split.cpp" />

+    <ClCompile Include="..\s\d_state.cpp" />

+    <ClCompile Include="..\s\d_writeback.cpp" />

+    <ClCompile Include="..\s\grid.cpp" />

+    <ClCompile Include="..\s\shard.cpp" />

+    <ClCompile Include="..\s\shardconnection.cpp" />

+    <ClCompile Include="..\s\shardkey.cpp" />

+    <ClCompile Include="..\third_party\snappy\snappy-sinksource.cc">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\third_party\snappy\snappy.cc">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\util\alignedbuilder.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\util\compress.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\util\concurrency\spin_lock.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\util\concurrency\synchronization.cpp" />

+    <ClCompile Include="..\util\concurrency\task.cpp" />

+    <ClCompile Include="..\util\concurrency\thread_pool.cpp" />

+    <ClCompile Include="..\util\concurrency\vars.cpp" />

+    <ClCompile Include="..\util\file_allocator.cpp" />

+    <ClCompile Include="..\util\log.cpp" />

+    <ClCompile Include="..\util\logfile.cpp" />

+    <ClCompile Include="..\util\mmap_win.cpp" />

+    <ClCompile Include="..\db\namespace.cpp" />

+    <ClCompile Include="..\db\nonce.cpp" />

+    <ClCompile Include="..\db\pdfile.cpp" />

+    <ClCompile Include="..\db\queryoptimizer.cpp" />

+    <ClCompile Include="..\util\processinfo.cpp" />

+    <ClCompile Include="..\db\repl.cpp" />

+    <ClCompile Include="..\db\security.cpp" />

+    <ClCompile Include="..\db\security_commands.cpp" />

+    <ClCompile Include="..\db\tests.cpp" />

+    <ClCompile Include="..\db\cmdline.cpp" />

+    <ClCompile Include="..\db\dbmessage.cpp" />

+    <ClCompile Include="..\db\matcher_covered.cpp" />

+    <ClCompile Include="..\db\oplog.cpp" />

+    <ClCompile Include="..\db\queryutil.cpp" />

+    <ClCompile Include="..\db\repl_block.cpp" />

+    <ClCompile Include="..\util\assert_util.cpp" />

+    <ClCompile Include="..\util\background.cpp" />

+    <ClCompile Include="..\util\base64.cpp" />

+    <ClCompile Include="..\util\md5.c">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeaderFile>

+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="..\util\md5main.cpp" />

+    <ClCompile Include="..\util\net\message.cpp" />

+    <ClCompile Include="..\util\net\listen.cpp" />

+    <ClCompile Include="..\util\net\message_server_port.cpp" />

+    <ClCompile Include="..\util\net\message_port.cpp" />

+    <ClCompile Include="..\util\net\miniwebserver.cpp" />

+    <ClCompile Include="..\util\mmap.cpp" />

+    <ClCompile Include="..\util\processinfo_win32.cpp" />

+    <ClCompile Include="..\util\ramlog.cpp" />

+    <ClCompile Include="..\util\net\sock.cpp" />

+    <ClCompile Include="..\util\stringutils.cpp" />

+    <ClCompile Include="..\util\text.cpp" />

+    <ClCompile Include="..\util\util.cpp" />

+    <ClCompile Include="..\s\d_logic.cpp" />

+    <ClCompile Include="..\scripting\engine.cpp" />

+    <ClCompile Include="..\scripting\engine_spidermonkey.cpp" />

+    <ClCompile Include="..\shell\mongo.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+      </PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+      </PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="..\scripting\utils.cpp" />

+    <ClCompile Include="..\util\version.cpp" />

+    <ClCompile Include="basictests.cpp" />

+    <ClCompile Include="btreetests.cpp" />

+    <ClCompile Include="clienttests.cpp" />

+    <ClCompile Include="cursortests.cpp" />

+    <ClCompile Include="dbtests.cpp" />

+    <ClCompile Include="directclienttests.cpp" />

+    <ClCompile Include="d_chunk_manager_tests.cpp" />

+    <ClCompile Include="framework.cpp" />

+    <ClCompile Include="jsobjtests.cpp" />

+    <ClCompile Include="jsontests.cpp" />

+    <ClCompile Include="jstests.cpp" />

+    <ClCompile Include="matchertests.cpp" />

+    <ClCompile Include="mmaptests.cpp" />

+    <ClCompile Include="namespacetests.cpp" />

+    <ClCompile Include="pdfiletests.cpp" />

+    <ClCompile Include="perftests.cpp" />

+    <ClCompile Include="queryoptimizercursortests.cpp" />

+    <ClCompile Include="queryoptimizertests.cpp" />

+    <ClCompile Include="querytests.cpp" />

+    <ClCompile Include="repltests.cpp" />

+    <ClCompile Include="socktests.cpp" />

+    <ClCompile Include="spin_lock_test.cpp" />

+    <ClCompile Include="threadedtests.cpp">

+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4180;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4180;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+    </ClCompile>

+    <ClCompile Include="updatetests.cpp" />

+    <ClCompile Include="..\db\stats\counters.cpp" />

+    <ClCompile Include="..\db\stats\snapshots.cpp" />

+    <ClCompile Include="..\db\stats\top.cpp" />

+    <ClCompile Include="..\db\repl\health.cpp" />

+    <ClCompile Include="..\db\repl\replset_commands.cpp" />

+    <ClCompile Include="..\db\repl\rs_config.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\SConstruct" />

+    <None Include="btreetests.inl" />

+  </ItemGroup>

+  <ItemGroup>

+    <Library Include="..\..\js\js32d.lib">

+      <FileType>Document</FileType>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+    </Library>

+    <Library Include="..\..\js\js32r.lib">

+      <FileType>Document</FileType>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

+    </Library>

+    <Library Include="..\..\js\js64d.lib">

+      <FileType>Document</FileType>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+    </Library>

+    <Library Include="..\..\js\js64r.lib">

+      <FileType>Document</FileType>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+    </Library>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

 </Project>
\ No newline at end of file
diff --git a/dbtests/test.vcxproj.filters b/dbtests/test.vcxproj.filters
index 9a1782f300f..7048c50bcbb 100755
--- a/dbtests/test.vcxproj.filters
+++ b/dbtests/test.vcxproj.filters
@@ -325,6 +325,11 @@
     <ClInclude Include="..\third_party\pcre-7.4\pcrecpp.h" />

     <ClInclude Include="..\third_party\pcre-7.4\config.h" />

     <ClInclude Include="..\third_party\pcre-7.4\pcre.h" />

+    <ClInclude Include="..\db\collection.h" />

+    <ClInclude Include="..\db\databaseholder.h">

+      <Filter>db\h</Filter>

+    </ClInclude>

+    <ClInclude Include="framework.h" />

   </ItemGroup>

   <ItemGroup>

     <Library Include="..\..\js\js64r.lib">

@@ -491,7 +496,7 @@
     <ClCompile Include="..\scripting\engine_spidermonkey.cpp">

       <Filter>scripting</Filter>

     </ClCompile>

-    <ClCompile Include="..\shell\mongo_vstudio.cpp">

+    <ClCompile Include="..\shell\mongo.cpp">

       <Filter>scripting</Filter>

     </ClCompile>

     <ClCompile Include="..\scripting\utils.cpp">

@@ -893,6 +898,15 @@
     <ClCompile Include="..\db\commands\cloud.cpp">

       <Filter>db\cpp</Filter>

     </ClCompile>

+    <ClCompile Include="..\db\d_concurrency.cpp">

+      <Filter>db\cpp</Filter>

+    </ClCompile>

+    <ClCompile Include="d_chunk_manager_tests.cpp">

+      <Filter>shard</Filter>

+    </ClCompile>

+    <ClCompile Include="queryoptimizercursortests.cpp">

+      <Filter>dbtests</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\SConstruct">

diff --git a/dbtests/threadedtests.cpp b/dbtests/threadedtests.cpp
index 3794c4c857f..56f3c3a38ae 100644
--- a/dbtests/threadedtests.cpp
+++ b/dbtests/threadedtests.cpp
@@ -461,7 +461,7 @@ namespace ThreadedTests {
             }
             
             // must assert as the item is missing
-            ASSERT_EXCEPTION( l.orphan( new M( -3 ) ) , UserException );
+            ASSERT_THROWS( l.orphan( new M( -3 ) ) , UserException );
         }
     };