diff options
166 files changed, 217 insertions, 208 deletions
diff --git a/SConstruct b/SConstruct index ef762729a14..46890774f53 100644 --- a/SConstruct +++ b/SConstruct @@ -359,7 +359,7 @@ if GetOption( "extralib" ) is not None: # ------ SOURCE FILE SETUP ----------- -commonFiles = Split( "stdafx.cpp buildinfo.cpp db/common.cpp db/jsobj.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" ) +commonFiles = Split( "pch.cpp buildinfo.cpp db/common.cpp db/jsobj.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" ) commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/ramstore.cpp", "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" , "util/assert_util.cpp" , "util/httpclient.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/debug_util.cpp", "util/thread_pool.cpp" ] @@ -594,7 +594,7 @@ elif "win32" == os.sys.platform: env.Append( CPPFLAGS=" /wd4355 /wd4800 " ) #some warnings we don't like env.Append( CPPDEFINES=["WIN32","_CONSOLE","_CRT_SECURE_NO_WARNINGS","HAVE_CONFIG_H","PCRE_STATIC","_UNICODE","UNICODE","SUPPORT_UCP","SUPPORT_UTF8,PSAPI_VERSION=1" ] ) - #env.Append( CPPFLAGS=' /Yu"stdafx.h" ' ) # this would be for pre-compiled headers, could play with it later + #env.Append( CPPFLAGS=' /Yu"pch.h" ' ) # this would be for pre-compiled headers, could play with it later if release: env.Append( CPPDEFINES=[ "NDEBUG" ] ) @@ -698,9 +698,9 @@ if nix: # pre-compiled headers if False and 'Gch' in dir( env ): print( "using precompiled headers" ) - env['Gch'] = env.Gch( [ "stdafx.h" ] )[0] - #Depends( "stdafx.o" , "stdafx.h.gch" ) - #SideEffect( "dummyGCHSideEffect" , "stdafx.h.gch" ) + env['Gch'] = env.Gch( [ "pch.h" ] )[0] + #Depends( "pch.o" , "pch.h.gch" ) + #SideEffect( "dummyGCHSideEffect" , "pch.h.gch" ) if usev8: env.Append( CPPPATH=["../v8/include/"] ) @@ -774,7 +774,7 @@ def setupBuildInfoFile( outFile ): version = getGitVersion() sysInfo = getSysInfo() contents = '\n'.join([ - '#include "stdafx.h"', + '#include "pch.h"', '#include <iostream>', '#include <boost/version.hpp>', 'namespace mongo { const char * gitVersion(){ return "' + version + '"; } }', @@ -1443,7 +1443,7 @@ def getSystemInstallName(): return n def getCodeVersion(): - fullSource = open( "stdafx.cpp" , "r" ).read() + fullSource = open( "pch.cpp" , "r" ).read() allMatches = re.findall( r"versionString.. = \"(.*?)\"" , fullSource ); if len(allMatches) != 1: print( "can't find version # in code" ) diff --git a/client/connpool.cpp b/client/connpool.cpp index 2b814631bd3..080fcfe1e5d 100644 --- a/client/connpool.cpp +++ b/client/connpool.cpp @@ -18,7 +18,7 @@ // _ todo: reconnect? -#include "stdafx.h" +#include "pch.h" #include "connpool.h" #include "../db/commands.h" #include "syncclusterconnection.h" diff --git a/client/dbclient.cpp b/client/dbclient.cpp index 4a2d7ed3638..310b7a11870 100644 --- a/client/dbclient.cpp +++ b/client/dbclient.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "../db/pdfile.h" #include "dbclient.h" #include "../bson/util/builder.h" diff --git a/client/dbclient.h b/client/dbclient.h index 6084994463d..4e8e2aa5314 100644 --- a/client/dbclient.h +++ b/client/dbclient.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/message.h" #include "../db/jsobj.h" #include "../db/json.h" diff --git a/client/model.cpp b/client/model.cpp index fad8a252a9c..fb66b71decd 100644 --- a/client/model.cpp +++ b/client/model.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "model.h" #include "connpool.h" diff --git a/client/parallel.cpp b/client/parallel.cpp index 1b82c010e38..2b2c0404086 100644 --- a/client/parallel.cpp +++ b/client/parallel.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "parallel.h" #include "connpool.h" #include "../db/queryutil.h" diff --git a/client/syncclusterconnection.cpp b/client/syncclusterconnection.cpp index 4d5802f81b8..2499ffee52c 100644 --- a/client/syncclusterconnection.cpp +++ b/client/syncclusterconnection.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "syncclusterconnection.h" #include "../db/dbmessage.h" diff --git a/client/syncclusterconnection.h b/client/syncclusterconnection.h index ff8bb2bfc86..8d381d4b4d7 100644 --- a/client/syncclusterconnection.h +++ b/client/syncclusterconnection.h @@ -16,7 +16,7 @@ */ -#include "../stdafx.h" +#include "../pch.h" #include "dbclient.h" #include "redef_macros.h" diff --git a/db/btree.cpp b/db/btree.cpp index 161e4163c76..4c0f26371a3 100644 --- a/db/btree.cpp +++ b/db/btree.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "btree.h" #include "pdfile.h" diff --git a/db/btree.h b/db/btree.h index 1edb8d6f22d..6e499337eb5 100644 --- a/db/btree.h +++ b/db/btree.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "diskloc.h" #include "pdfile.h" diff --git a/db/btreecursor.cpp b/db/btreecursor.cpp index 5ada14ee9fe..79054b1008f 100644 --- a/db/btreecursor.cpp +++ b/db/btreecursor.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "btree.h" #include "pdfile.h" #include "jsobj.h" diff --git a/db/client.cpp b/db/client.cpp index 728f5f55caa..1eba71a3f3a 100644 --- a/db/client.cpp +++ b/db/client.cpp @@ -20,7 +20,7 @@ to an open socket (or logical connection if pooling on sockets) from a client. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "client.h" #include "curop.h" diff --git a/db/client.h b/db/client.h index 96dbdc085c6..9d7612ceb5b 100644 --- a/db/client.h +++ b/db/client.h @@ -24,7 +24,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "security.h" #include "namespace.h" #include "lasterror.h" diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp index 807613775e1..5eed8c3de2e 100644 --- a/db/clientcursor.cpp +++ b/db/clientcursor.cpp @@ -22,7 +22,7 @@ Cursor -- and its derived classes -- are our internal cursors. */ -#include "stdafx.h" +#include "pch.h" #include "query.h" #include "introspect.h" #include <time.h> diff --git a/db/clientcursor.h b/db/clientcursor.h index d0726faf70f..a7f2654abe6 100644 --- a/db/clientcursor.h +++ b/db/clientcursor.h @@ -24,7 +24,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "cursor.h" #include "jsobj.h" #include "../util/message.h" diff --git a/db/cloner.cpp b/db/cloner.cpp index fa12b3d0250..e82448c6133 100644 --- a/db/cloner.cpp +++ b/db/cloner.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "../client/dbclient.h" #include "../bson/util/builder.h" diff --git a/db/cmdline.cpp b/db/cmdline.cpp index 16e20f8c4e8..7dff5582b99 100644 --- a/db/cmdline.cpp +++ b/db/cmdline.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "cmdline.h" #include "commands.h" diff --git a/db/cmdline.h b/db/cmdline.h index a60d01a4bee..40a746c9825 100644 --- a/db/cmdline.h +++ b/db/cmdline.h @@ -16,7 +16,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" namespace mongo { diff --git a/db/commands.cpp b/db/commands.cpp index a60a1c84f42..5293afdb7df 100644 --- a/db/commands.cpp +++ b/db/commands.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "jsobj.h" #include "commands.h" #include "client.h" diff --git a/db/commands.h b/db/commands.h index 8bfb6a716e8..3335eb501cd 100644 --- a/db/commands.h +++ b/db/commands.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" namespace mongo { diff --git a/db/common.cpp b/db/common.cpp index a199bd1f97a..4df5b0e4276 100644 --- a/db/common.cpp +++ b/db/common.cpp @@ -1,6 +1,6 @@ // common.cpp -#include "stdafx.h" +#include "pch.h" #include "concurrency.h" /** diff --git a/db/cursor.cpp b/db/cursor.cpp index 29f9c9791cb..e98cb7a27a6 100644 --- a/db/cursor.cpp +++ b/db/cursor.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "curop.h" diff --git a/db/cursor.h b/db/cursor.h index 69e5d673824..a1e5666eb24 100644 --- a/db/cursor.h +++ b/db/cursor.h @@ -16,7 +16,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "diskloc.h" diff --git a/db/database.cpp b/db/database.cpp index 6361e865fbf..d2c6583e81e 100644 --- a/db/database.cpp +++ b/db/database.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "database.h" diff --git a/db/db.cpp b/db/db.cpp index 907553254c2..ba78a0ec33e 100644 --- a/db/db.cpp +++ b/db/db.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "query.h" #include "introspect.h" @@ -16,7 +16,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/message.h" #include "boost/version.hpp" #include "concurrency.h" diff --git a/db/db.vcproj b/db/db.vcproj index a2a926fd4a1..1b403916125 100644 --- a/db/db.vcproj +++ b/db/db.vcproj @@ -49,6 +49,7 @@ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="pch.h"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
@@ -128,7 +129,7 @@ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderThrough="pch.h"
WarningLevel="3"
DebugInformationFormat="3"
DisableSpecificWarnings="4355;4800"
@@ -1035,6 +1036,10 @@ >
</File>
<File
+ RelativePath="..\client\syncclusterconnection.h"
+ >
+ </File>
+ <File
RelativePath="..\client\undef_macros.h"
>
</File>
@@ -1042,6 +1047,10 @@ <Filter
Name="db"
>
+ <File
+ RelativePath="..\pch.cpp"
+ >
+ </File>
<Filter
Name="cpp"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
@@ -1200,42 +1209,6 @@ >
</File>
<File
- RelativePath="..\stdafx.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="release_nojni|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug Recstore|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\tests.cpp"
>
</File>
@@ -1312,6 +1285,10 @@ >
</File>
<File
+ RelativePath=".\indexkey.h"
+ >
+ </File>
+ <File
RelativePath=".\introspect.h"
>
</File>
@@ -1658,10 +1635,26 @@ >
</File>
<File
+ RelativePath="..\scripting\engine.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripting\engine_java.h"
+ >
+ </File>
+ <File
RelativePath="..\scripting\engine_spidermonkey.cpp"
>
</File>
<File
+ RelativePath="..\scripting\engine_spidermonkey.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripting\engine_v8.h"
+ >
+ </File>
+ <File
RelativePath="..\shell\mongo_vstudio.cpp"
>
<FileConfiguration
@@ -1693,6 +1686,18 @@ RelativePath="..\scripting\utils.cpp"
>
</File>
+ <File
+ RelativePath="..\scripting\v8_db.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripting\v8_utils.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scripting\v8_wrapper.h"
+ >
+ </File>
</Filter>
<Filter
Name="stats"
diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp index bc78c78459f..992f9ba9182 100644 --- a/db/dbcommands.cpp +++ b/db/dbcommands.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "query.h" #include "pdfile.h" #include "jsobj.h" diff --git a/db/dbcommands_admin.cpp b/db/dbcommands_admin.cpp index 8aedbc973a3..20ac17c3c95 100644 --- a/db/dbcommands_admin.cpp +++ b/db/dbcommands_admin.cpp @@ -22,7 +22,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "jsobj.h" #include "pdfile.h" #include "namespace.h" diff --git a/db/dbeval.cpp b/db/dbeval.cpp index c6ab52ad624..3652f14fdf6 100644 --- a/db/dbeval.cpp +++ b/db/dbeval.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "query.h" #include "pdfile.h" #include "jsobj.h" diff --git a/db/dbhelpers.cpp b/db/dbhelpers.cpp index ee221aba81b..e92a28bdd3b 100644 --- a/db/dbhelpers.cpp +++ b/db/dbhelpers.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "dbhelpers.h" #include "query.h" diff --git a/db/dbhelpers.h b/db/dbhelpers.h index 3c223d8f827..19c687ab966 100644 --- a/db/dbhelpers.h +++ b/db/dbhelpers.h @@ -22,7 +22,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "client.h" #include "db.h" diff --git a/db/dbwebserver.cpp b/db/dbwebserver.cpp index 685c062197d..925e61a7de1 100644 --- a/db/dbwebserver.cpp +++ b/db/dbwebserver.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/miniwebserver.h" #include "../util/web/html.h" #include "../util/md5.hpp" diff --git a/db/driverHelpers.cpp b/db/driverHelpers.cpp index 0786be15a08..059ecfc7108 100644 --- a/db/driverHelpers.cpp +++ b/db/driverHelpers.cpp @@ -21,7 +21,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "jsobj.h" #include "pdfile.h" #include "namespace.h" diff --git a/db/extsort.cpp b/db/extsort.cpp index 9bb0cb9e75f..93dd701ec23 100644 --- a/db/extsort.cpp +++ b/db/extsort.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "extsort.h" #include "namespace.h" diff --git a/db/extsort.h b/db/extsort.h index 60ee423e83d..fa0eca4b3a1 100644 --- a/db/extsort.h +++ b/db/extsort.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "namespace.h" #include "curop.h" diff --git a/db/index.cpp b/db/index.cpp index 595d092205c..bd302a9cac3 100644 --- a/db/index.cpp +++ b/db/index.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "namespace.h" #include "index.h" #include "btree.h" diff --git a/db/index.h b/db/index.h index 698f4323cea..b70a6bc3aa9 100644 --- a/db/index.h +++ b/db/index.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "diskloc.h" #include "jsobj.h" #include "indexkey.h" diff --git a/db/index_geo2d.cpp b/db/index_geo2d.cpp index 8a2c0f19baa..80d0963e8d9 100644 --- a/db/index_geo2d.cpp +++ b/db/index_geo2d.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "namespace.h" #include "jsobj.h" #include "index.h" diff --git a/db/indexkey.cpp b/db/indexkey.cpp index a18afe1c7d8..19eb247b68d 100644 --- a/db/indexkey.cpp +++ b/db/indexkey.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "namespace.h" #include "index.h" #include "btree.h" diff --git a/db/indexkey.h b/db/indexkey.h index 3c98a9dd8bc..47f4a65d94d 100644 --- a/db/indexkey.h +++ b/db/indexkey.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "diskloc.h" #include "jsobj.h" #include <map> diff --git a/db/instance.cpp b/db/instance.cpp index efe105e2a2b..ccf1ef1fd62 100644 --- a/db/instance.cpp +++ b/db/instance.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "query.h" #include "introspect.h" diff --git a/db/introspect.cpp b/db/introspect.cpp index 1332db4e4ea..d72bb3fcea7 100644 --- a/db/introspect.cpp +++ b/db/introspect.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "introspect.h" #include "../bson/util/builder.h" #include "../util/goodies.h" diff --git a/db/introspect.h b/db/introspect.h index 1c0fe92646b..3f6ef60d645 100644 --- a/db/introspect.h +++ b/db/introspect.h @@ -19,7 +19,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "pdfile.h" diff --git a/db/jsobj.cpp b/db/jsobj.cpp index feb0def14e1..9bbc5e16581 100644 --- a/db/jsobj.cpp +++ b/db/jsobj.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "jsobj.h" #include "nonce.h" #include "../bson/util/atomic_int.h" diff --git a/db/jsobj.h b/db/jsobj.h index a8d1fc5e6eb..1ba172fac48 100644 --- a/db/jsobj.h +++ b/db/jsobj.h @@ -28,7 +28,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../bson/util/builder.h" #include "../util/optime.h" #include "boost/utility.hpp" diff --git a/db/json.cpp b/db/json.cpp index 2df9ce2379b..86db26c4ced 100644 --- a/db/json.cpp +++ b/db/json.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "json.h" #include "../bson/util/builder.h" #include "../util/base64.h" diff --git a/db/json.h b/db/json.h index c65785aa060..bbed12c0801 100644 --- a/db/json.h +++ b/db/json.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" namespace mongo { diff --git a/db/lasterror.cpp b/db/lasterror.cpp index 53042e77791..ade44e2b9ba 100644 --- a/db/lasterror.cpp +++ b/db/lasterror.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "../util/unittest.h" #include "../util/message.h" diff --git a/db/matcher.cpp b/db/matcher.cpp index 4c56f289862..c49fa359255 100644 --- a/db/matcher.cpp +++ b/db/matcher.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "matcher.h" #include "../util/goodies.h" #include "../util/unittest.h" diff --git a/db/matcher_covered.cpp b/db/matcher_covered.cpp index 6ed31ee0524..f11d1b28e34 100644 --- a/db/matcher_covered.cpp +++ b/db/matcher_covered.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "matcher.h" #include "../util/goodies.h" #include "../util/unittest.h" diff --git a/db/module.cpp b/db/module.cpp index 78f8f795a61..1e4f51132ea 100644 --- a/db/module.cpp +++ b/db/module.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "module.h" namespace mongo { diff --git a/db/module.h b/db/module.h index 728e861a786..d4939dd9cde 100644 --- a/db/module.h +++ b/db/module.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include <boost/program_options.hpp> #include <list> diff --git a/db/modules/mms.cpp b/db/modules/mms.cpp index 248a4e473dd..9187c0f7785 100644 --- a/db/modules/mms.cpp +++ b/db/modules/mms.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "../db.h" #include "../instance.h" #include "../module.h" diff --git a/db/mr.cpp b/db/mr.cpp index e4350baab8e..e6ffd15b7a0 100644 --- a/db/mr.cpp +++ b/db/mr.cpp @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "instance.h" #include "commands.h" diff --git a/db/namespace.cpp b/db/namespace.cpp index 9eca39c72f0..828cee538f3 100644 --- a/db/namespace.cpp +++ b/db/namespace.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "db.h" #include "../util/mmap.h" diff --git a/db/namespace.h b/db/namespace.h index 4e50ce2f0f3..881a6c2c681 100644 --- a/db/namespace.h +++ b/db/namespace.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "queryutil.h" #include "diskloc.h" diff --git a/db/nonce.cpp b/db/nonce.cpp index b0889426e07..e01332a3e32 100644 --- a/db/nonce.cpp +++ b/db/nonce.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "nonce.h" extern int do_md5_test(void); diff --git a/db/oplog.cpp b/db/oplog.cpp index 840b8f76382..8cd8ce35fa8 100644 --- a/db/oplog.cpp +++ b/db/oplog.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "oplog.h" #include "repl_block.h" #include "repl.h" diff --git a/db/pdfile.cpp b/db/pdfile.cpp index 79518b78a1c..69b1727834a 100644 --- a/db/pdfile.cpp +++ b/db/pdfile.cpp @@ -24,7 +24,7 @@ _ coalesce deleted _ disallow system* manipulations from the database. */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "db.h" #include "../util/mmap.h" diff --git a/db/pdfile.h b/db/pdfile.h index 9b7a1851ea2..814dd630a28 100644 --- a/db/pdfile.h +++ b/db/pdfile.h @@ -25,7 +25,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/mmap.h" #include "diskloc.h" #include "jsobjmanipulator.h" diff --git a/db/query.cpp b/db/query.cpp index 5929d665624..c8e771f37f1 100644 --- a/db/query.cpp +++ b/db/query.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "query.h" #include "pdfile.h" #include "jsobjmanipulator.h" diff --git a/db/query.h b/db/query.h index 67cb8f59231..01cc551fee2 100644 --- a/db/query.h +++ b/db/query.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/message.h" #include "dbmessage.h" #include "jsobj.h" diff --git a/db/queryoptimizer.cpp b/db/queryoptimizer.cpp index a71db42d236..a2fac28a23f 100644 --- a/db/queryoptimizer.cpp +++ b/db/queryoptimizer.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "db.h" #include "btree.h" diff --git a/db/queryutil.cpp b/db/queryutil.cpp index 8e9e310a3d5..445e61d06f5 100644 --- a/db/queryutil.cpp +++ b/db/queryutil.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "btree.h" #include "matcher.h" diff --git a/db/reccache.cpp b/db/reccache.cpp index 6e1f3de6fec..f690a856da7 100644 --- a/db/reccache.cpp +++ b/db/reccache.cpp @@ -16,7 +16,7 @@ // storage.cpp -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "reccache.h" #include "rec.h" diff --git a/db/repl.cpp b/db/repl.cpp index 9c81509430a..8edd1b10399 100644 --- a/db/repl.cpp +++ b/db/repl.cpp @@ -31,7 +31,7 @@ local.pair.sync - { initialsynccomplete: 1 } */ -#include "stdafx.h" +#include "pch.h" #include "jsobj.h" #include "../util/goodies.h" #include "repl.h" diff --git a/db/repl/health.cpp b/db/repl/health.cpp index 7924643602e..026219890eb 100644 --- a/db/repl/health.cpp +++ b/db/repl/health.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "replset.h" #include "health.h" #include "../../util/background.h" diff --git a/db/repl/replset.cpp b/db/repl/replset.cpp index 3c7a0753b0b..4a70513cf40 100644 --- a/db/repl/replset.cpp +++ b/db/repl/replset.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../cmdline.h" #include "../../util/sock.h" #include "replset.h" diff --git a/db/repl/replset_commands.cpp b/db/repl/replset_commands.cpp index 4cab9ea9046..4df9bf4d3e4 100644 --- a/db/repl/replset_commands.cpp +++ b/db/repl/replset_commands.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../cmdline.h" #include "health.h" #include "../commands.h" diff --git a/db/repl/rs_config.cpp b/db/repl/rs_config.cpp index ffe589e6da9..7f4140e8818 100644 --- a/db/repl/rs_config.cpp +++ b/db/repl/rs_config.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "rs_config.h" #include "replset.h" #include "../../client/dbclient.h" diff --git a/db/repl_block.cpp b/db/repl_block.cpp index 60a8653f267..144467ef38b 100644 --- a/db/repl_block.cpp +++ b/db/repl_block.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "repl_block.h" #include "instance.h" #include "dbhelpers.h" diff --git a/db/security.cpp b/db/security.cpp index a41ad950a4d..c552b53f364 100644 --- a/db/security.cpp +++ b/db/security.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "security.h" #include "instance.h" #include "client.h" diff --git a/db/security_commands.cpp b/db/security_commands.cpp index 233129c314e..07f6bcf0b0f 100644 --- a/db/security_commands.cpp +++ b/db/security_commands.cpp @@ -19,7 +19,7 @@ // security.cpp -#include "stdafx.h" +#include "pch.h" #include "security.h" #include "../util/md5.hpp" #include "json.h" diff --git a/db/stats/counters.cpp b/db/stats/counters.cpp index d07812d0827..6a4cbacf18a 100644 --- a/db/stats/counters.cpp +++ b/db/stats/counters.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "../jsobj.h" #include "counters.h" diff --git a/db/stats/snapshots.cpp b/db/stats/snapshots.cpp index 154829780c8..f7afb2f5946 100644 --- a/db/stats/snapshots.cpp +++ b/db/stats/snapshots.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "snapshots.h" #include "../client.h" #include "../clientcursor.h" diff --git a/db/stats/top.cpp b/db/stats/top.cpp index c47aa0f7357..55079489f66 100644 --- a/db/stats/top.cpp +++ b/db/stats/top.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "top.h" #include "../../util/message.h" #include "../commands.h" diff --git a/db/storage.cpp b/db/storage.cpp index b17784020b5..502772ac02d 100644 --- a/db/storage.cpp +++ b/db/storage.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "pdfile.h" #include "reccache.h" #include "rec.h" diff --git a/db/tests.cpp b/db/tests.cpp index 81cc363a75c..1218f1b5add 100644 --- a/db/tests.cpp +++ b/db/tests.cpp @@ -19,7 +19,7 @@ unit test & such */ -#include "stdafx.h" +#include "pch.h" #include "../util/mmap.h" namespace mongo { diff --git a/db/update.cpp b/db/update.cpp index 1895d93cd8c..c24548fa8dd 100644 --- a/db/update.cpp +++ b/db/update.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "query.h" #include "pdfile.h" #include "jsobjmanipulator.h" diff --git a/db/update.h b/db/update.h index 5d20114fe97..cf48cedf1dd 100644 --- a/db/update.h +++ b/db/update.h @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../stdafx.h" +#include "../pch.h" #include "jsobj.h" #include "../util/embedded_builder.h" #include "matcher.h" diff --git a/dbtests/basictests.cpp b/dbtests/basictests.cpp index 85e04bb48aa..2938910a3b6 100644 --- a/dbtests/basictests.cpp +++ b/dbtests/basictests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "dbtests.h" #include "../util/base64.h" diff --git a/dbtests/btreetests.cpp b/dbtests/btreetests.cpp index 510244d666c..cb569310c02 100644 --- a/dbtests/btreetests.cpp +++ b/dbtests/btreetests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/db.h" #include "../db/btree.h" diff --git a/dbtests/clienttests.cpp b/dbtests/clienttests.cpp index 1d4e1d6bfe2..7b151376dbf 100644 --- a/dbtests/clienttests.cpp +++ b/dbtests/clienttests.cpp @@ -16,7 +16,7 @@ // client.cpp -#include "stdafx.h" +#include "pch.h" #include "../client/dbclient.h" #include "dbtests.h" #include "../db/concurrency.h" diff --git a/dbtests/cursortests.cpp b/dbtests/cursortests.cpp index f14c5fadca8..8d2a0ac00b2 100644 --- a/dbtests/cursortests.cpp +++ b/dbtests/cursortests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/db.h" #include "../db/clientcursor.h" #include "../db/instance.h" diff --git a/dbtests/dbtests.cpp b/dbtests/dbtests.cpp index 4b81ea97e96..195a1d17d76 100644 --- a/dbtests/dbtests.cpp +++ b/dbtests/dbtests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "dbtests.h" diff --git a/dbtests/framework.cpp b/dbtests/framework.cpp index 0f7636d070b..2222e18a967 100644 --- a/dbtests/framework.cpp +++ b/dbtests/framework.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include <boost/program_options.hpp> #undef assert diff --git a/dbtests/framework.h b/dbtests/framework.h index 9774832921b..8969fe21c3b 100644 --- a/dbtests/framework.h +++ b/dbtests/framework.h @@ -21,7 +21,7 @@ simple portable regression system */ -#include "../stdafx.h" +#include "../pch.h" #define ASSERT_EXCEPTION(a,b) \ try { \ diff --git a/dbtests/jsobjtests.cpp b/dbtests/jsobjtests.cpp index 8f9991b435f..67e62b34e56 100644 --- a/dbtests/jsobjtests.cpp +++ b/dbtests/jsobjtests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/jsobj.h" #include "../db/jsobjmanipulator.h" #include "../db/json.h" diff --git a/dbtests/jsontests.cpp b/dbtests/jsontests.cpp index 3ab25ed3944..a45f97f90ca 100644 --- a/dbtests/jsontests.cpp +++ b/dbtests/jsontests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/jsobj.h" #include "../db/json.h" diff --git a/dbtests/jstests.cpp b/dbtests/jstests.cpp index 0ecfd4297ad..009bd3fda99 100644 --- a/dbtests/jstests.cpp +++ b/dbtests/jstests.cpp @@ -17,10 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/instance.h" -#include "../stdafx.h" +#include "../pch.h" #include "../scripting/engine.h" #include "dbtests.h" diff --git a/dbtests/matchertests.cpp b/dbtests/matchertests.cpp index 5338ad800cb..696c924e1aa 100644 --- a/dbtests/matchertests.cpp +++ b/dbtests/matchertests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/matcher.h" #include "../db/json.h" diff --git a/dbtests/namespacetests.cpp b/dbtests/namespacetests.cpp index a1e69f0fc8b..7457114b355 100644 --- a/dbtests/namespacetests.cpp +++ b/dbtests/namespacetests.cpp @@ -18,7 +18,7 @@ */ // Where IndexDetails defined. -#include "stdafx.h" +#include "pch.h" #include "../db/namespace.h" #include "../db/db.h" diff --git a/dbtests/pairingtests.cpp b/dbtests/pairingtests.cpp index b11a37ee29a..d432d5589ea 100644 --- a/dbtests/pairingtests.cpp +++ b/dbtests/pairingtests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/replpair.h" #include "dbtests.h" #include "mockdbclient.h" diff --git a/dbtests/pdfiletests.cpp b/dbtests/pdfiletests.cpp index 522afcdab2f..026d3138f7c 100644 --- a/dbtests/pdfiletests.cpp +++ b/dbtests/pdfiletests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/pdfile.h" #include "../db/db.h" diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp index d757f1a4a01..e8affcc611b 100644 --- a/dbtests/queryoptimizertests.cpp +++ b/dbtests/queryoptimizertests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/queryoptimizer.h" #include "../db/db.h" diff --git a/dbtests/querytests.cpp b/dbtests/querytests.cpp index 4e4823017dc..7de33a47c4f 100644 --- a/dbtests/querytests.cpp +++ b/dbtests/querytests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/query.h" #include "../db/db.h" diff --git a/dbtests/repltests.cpp b/dbtests/repltests.cpp index 5986502aed5..3b643a148e4 100644 --- a/dbtests/repltests.cpp +++ b/dbtests/repltests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/repl.h" #include "../db/db.h" diff --git a/dbtests/socktests.cpp b/dbtests/socktests.cpp index 5ca253b36c5..267b1d647b5 100644 --- a/dbtests/socktests.cpp +++ b/dbtests/socktests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/sock.h" #include "dbtests.h" diff --git a/dbtests/threadedtests.cpp b/dbtests/threadedtests.cpp index 6691e66d531..6046fcb2a9b 100644 --- a/dbtests/threadedtests.cpp +++ b/dbtests/threadedtests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../bson/util/atomic_int.h" #include "../util/mvar.h" #include "../util/thread_pool.h" diff --git a/dbtests/updatetests.cpp b/dbtests/updatetests.cpp index 0203cde921d..17f861ec2e8 100644 --- a/dbtests/updatetests.cpp +++ b/dbtests/updatetests.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/query.h" #include "../db/db.h" @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #if defined( __MSVC__ ) // should probably check VS version here @@ -1,4 +1,4 @@ -// stdafx.h : include file for standard system include files, +// pch.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently // diff --git a/s/balance.cpp b/s/balance.cpp index e3910381ef8..47e9b30ebbb 100644 --- a/s/balance.cpp +++ b/s/balance.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../db/jsobj.h" #include "../db/cmdline.h" diff --git a/s/chunk.cpp b/s/chunk.cpp index 38183a89a60..a6ae7d16bc4 100644 --- a/s/chunk.cpp +++ b/s/chunk.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "chunk.h" #include "config.h" #include "../util/unittest.h" diff --git a/s/commands_admin.cpp b/s/commands_admin.cpp index 672988dd927..244854cdb68 100644 --- a/s/commands_admin.cpp +++ b/s/commands_admin.cpp @@ -25,7 +25,7 @@ _ secondary indexes */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../util/processinfo.h" diff --git a/s/commands_public.cpp b/s/commands_public.cpp index 968795b3d78..db3f7718e00 100644 --- a/s/commands_public.cpp +++ b/s/commands_public.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../db/dbmessage.h" #include "../client/connpool.h" diff --git a/s/config.cpp b/s/config.cpp index 81408fe68be..282c7d244e3 100644 --- a/s/config.cpp +++ b/s/config.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../util/unittest.h" #include "../client/connpool.h" diff --git a/s/config_migrate.cpp b/s/config_migrate.cpp index e95eb30f652..7dd61010bce 100644 --- a/s/config_migrate.cpp +++ b/s/config_migrate.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../util/unittest.h" #include "../client/connpool.h" diff --git a/s/cursors.cpp b/s/cursors.cpp index a1c9dfa7223..324c7a05b49 100644 --- a/s/cursors.cpp +++ b/s/cursors.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "cursors.h" #include "../client/connpool.h" #include "../db/queryutil.h" diff --git a/s/d_logic.cpp b/s/d_logic.cpp index d7cdb9e84bf..1e14a1eab6a 100644 --- a/s/d_logic.cpp +++ b/s/d_logic.cpp @@ -22,7 +22,7 @@ mostly around shard management and checking */ -#include "stdafx.h" +#include "pch.h" #include <map> #include <string> diff --git a/s/d_util.cpp b/s/d_util.cpp index 8c30d2e94df..b8d04e8ed6f 100644 --- a/s/d_util.cpp +++ b/s/d_util.cpp @@ -22,7 +22,7 @@ mostly around shard management and checking */ -#include "stdafx.h" +#include "pch.h" #include "util.h" using namespace std; diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj index 98852a1d5c7..ca559bd36c1 100644 --- a/s/dbgrid.vcproj +++ b/s/dbgrid.vcproj @@ -378,6 +378,10 @@ >
</File>
<File
+ RelativePath=".\shard.cpp"
+ >
+ </File>
+ <File
RelativePath=".\shardkey.cpp"
>
</File>
diff --git a/s/request.cpp b/s/request.cpp index 9eb5c03c1c8..ed67cfc9a05 100644 --- a/s/request.cpp +++ b/s/request.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "server.h" #include "../db/commands.h" diff --git a/s/s_only.cpp b/s/s_only.cpp index 36f0b7b8e8b..c838f3f7a02 100644 --- a/s/s_only.cpp +++ b/s/s_only.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "../client/dbclient.h" #include "../db/dbhelpers.h" #include "../db/matcher.h" diff --git a/s/server.cpp b/s/server.cpp index fcae752d5cb..5b28bfb0ab2 100644 --- a/s/server.cpp +++ b/s/server.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../util/unittest.h" #include "../client/connpool.h" diff --git a/s/shard.cpp b/s/shard.cpp index 3a286e0e75c..aa20f1778d7 100644 --- a/s/shard.cpp +++ b/s/shard.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../stdafx.h" +#include "pch.h" #include "shard.h" #include "config.h" diff --git a/s/shard.h b/s/shard.h index dfc5cef3d89..3ff171186fb 100644 --- a/s/shard.h +++ b/s/shard.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../client/connpool.h" namespace mongo { diff --git a/s/shardkey.cpp b/s/shardkey.cpp index 887d216aed9..0cd6388ad72 100644 --- a/s/shardkey.cpp +++ b/s/shardkey.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "chunk.h" #include "../db/jsobj.h" #include "../util/unittest.h" diff --git a/s/stats.cpp b/s/stats.cpp index 12630c3be54..bb7a9757135 100644 --- a/s/stats.cpp +++ b/s/stats.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "stats.h" namespace mongo { diff --git a/s/strategy.cpp b/s/strategy.cpp index e742a9ab836..8f567238f79 100644 --- a/s/strategy.cpp +++ b/s/strategy.cpp @@ -16,7 +16,7 @@ // stragegy.cpp -#include "stdafx.h" +#include "pch.h" #include "request.h" #include "../util/background.h" #include "../client/connpool.h" diff --git a/s/strategy.h b/s/strategy.h index 3bf3be3887b..2912445e011 100644 --- a/s/strategy.h +++ b/s/strategy.h @@ -18,7 +18,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "chunk.h" #include "request.h" diff --git a/s/strategy_shard.cpp b/s/strategy_shard.cpp index d5e60691056..bd291687c0f 100644 --- a/s/strategy_shard.cpp +++ b/s/strategy_shard.cpp @@ -16,7 +16,7 @@ // strategy_sharded.cpp -#include "stdafx.h" +#include "pch.h" #include "request.h" #include "chunk.h" #include "cursors.h" diff --git a/s/strategy_single.cpp b/s/strategy_single.cpp index cb23cbb1ecb..5f949106f9f 100644 --- a/s/strategy_single.cpp +++ b/s/strategy_single.cpp @@ -16,7 +16,7 @@ // strategy_simple.cpp -#include "stdafx.h" +#include "pch.h" #include "request.h" #include "../client/connpool.h" #include "../db/commands.h" diff --git a/scripting/engine.cpp b/scripting/engine.cpp index 99f5f7f579a..3da3941d642 100644 --- a/scripting/engine.cpp +++ b/scripting/engine.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "engine.h" #include "../util/file.h" #include "../client/dbclient.h" diff --git a/scripting/engine.h b/scripting/engine.h index 4b808b56f9f..e097401f51b 100644 --- a/scripting/engine.h +++ b/scripting/engine.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../db/jsobj.h" extern const char * jsconcatcode; // TODO: change name to mongoJSCode diff --git a/scripting/engine_java.h b/scripting/engine_java.h index ae11cc14f97..331d0e64596 100644 --- a/scripting/engine_java.h +++ b/scripting/engine_java.h @@ -19,7 +19,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include <jni.h> #include <boost/thread/tss.hpp> diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp index ded2eb27cd7..8d9a84819f3 100644 --- a/scripting/engine_spidermonkey.cpp +++ b/scripting/engine_spidermonkey.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "engine_spidermonkey.h" #include "../client/dbclient.h" diff --git a/scripting/utils.cpp b/scripting/utils.cpp index 21089ac72a9..3bb4bc93a40 100644 --- a/scripting/utils.cpp +++ b/scripting/utils.cpp @@ -16,7 +16,7 @@ */ -#include "stdafx.h" +#include "pch.h" #include "engine.h" #include "../util/md5.hpp" diff --git a/shell/utils.cpp b/shell/utils.cpp index ab572b0f5f4..f7ab565a034 100644 --- a/shell/utils.cpp +++ b/shell/utils.cpp @@ -16,7 +16,7 @@ */ -#include "../stdafx.h" +#include "../pch.h" #include <boost/thread/xtime.hpp> diff --git a/tools/bridge.cpp b/tools/bridge.cpp index d6f4acd371b..922d77ff2f4 100644 --- a/tools/bridge.cpp +++ b/tools/bridge.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "../util/message.h" #include "../client/dbclient.h" diff --git a/tools/dump.cpp b/tools/dump.cpp index 3430591926d..922481adfda 100644 --- a/tools/dump.cpp +++ b/tools/dump.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../stdafx.h" +#include "../pch.h" #include "../client/dbclient.h" #include "tool.h" diff --git a/tools/export.cpp b/tools/export.cpp index 05534190930..db490aef173 100644 --- a/tools/export.cpp +++ b/tools/export.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "client/dbclient.h" #include "db/json.h" diff --git a/tools/files.cpp b/tools/files.cpp index 2cbda12e9f4..a26772442af 100644 --- a/tools/files.cpp +++ b/tools/files.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "client/gridfs.h" #include "client/dbclient.h" diff --git a/tools/import.cpp b/tools/import.cpp index e34e73d07d7..4057f798f7d 100644 --- a/tools/import.cpp +++ b/tools/import.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "client/dbclient.h" #include "db/json.h" diff --git a/tools/restore.cpp b/tools/restore.cpp index 6fcf2d37c65..13fde263025 100644 --- a/tools/restore.cpp +++ b/tools/restore.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "../stdafx.h" +#include "../pch.h" #include "../client/dbclient.h" #include "../util/mmap.h" #include "tool.h" diff --git a/tools/stat.cpp b/tools/stat.cpp index c625680cccf..f72d61e99aa 100644 --- a/tools/stat.cpp +++ b/tools/stat.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "client/dbclient.h" #include "db/json.h" #include "../util/httpclient.h" diff --git a/util/assert_util.cpp b/util/assert_util.cpp index 953b191b029..bf166058679 100644 --- a/util/assert_util.cpp +++ b/util/assert_util.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "assert_util.h" #include "assert.h" #include "file.h" diff --git a/util/background.cpp b/util/background.cpp index 41253153247..2904a81fae7 100644 --- a/util/background.cpp +++ b/util/background.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "goodies.h" #include "background.h" diff --git a/util/base64.cpp b/util/base64.cpp index 8d9d5448173..35a3abae717 100644 --- a/util/base64.cpp +++ b/util/base64.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "base64.h" namespace mongo { diff --git a/util/debug_util.cpp b/util/debug_util.cpp index 9c2f5dc7358..f0a916d0ded 100644 --- a/util/debug_util.cpp +++ b/util/debug_util.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "../db/cmdline.h" #include "../db/jsobj.h" diff --git a/util/file_allocator.h b/util/file_allocator.h index cbb91e2a047..a051b01a13c 100644 --- a/util/file_allocator.h +++ b/util/file_allocator.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "../stdafx.h" +#include "../pch.h" #include <fcntl.h> #include <errno.h> #if defined(__freebsd__) diff --git a/util/hashtab.h b/util/hashtab.h index 8b68030ca25..c9b4e438dba 100644 --- a/util/hashtab.h +++ b/util/hashtab.h @@ -22,7 +22,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include <map> namespace mongo { diff --git a/util/httpclient.cpp b/util/httpclient.cpp index 9c5ff125d95..4f78029f36e 100644 --- a/util/httpclient.cpp +++ b/util/httpclient.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "httpclient.h" #include "sock.h" #include "message.h" diff --git a/util/httpclient.h b/util/httpclient.h index 2c7cfd7602b..8b9da9737c9 100644 --- a/util/httpclient.h +++ b/util/httpclient.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" namespace mongo { diff --git a/util/locks.h b/util/locks.h index 7e48d7a6988..18c077ba142 100644 --- a/util/locks.h +++ b/util/locks.h @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -//#include "../stdafx.h" +//#include "../pch.h" #pragma once diff --git a/util/lruishmap.h b/util/lruishmap.h index c390cb2d361..fe8b1dc4873 100644 --- a/util/lruishmap.h +++ b/util/lruishmap.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/goodies.h" namespace mongo { diff --git a/util/md5main.cpp b/util/md5main.cpp index d5b49821620..9c56f91b43c 100644 --- a/util/md5main.cpp +++ b/util/md5main.cpp @@ -40,7 +40,7 @@ 2002-04-13 lpd Splits off main program into a separate file, md5main.c. */ -#include "stdafx.h" +#include "pch.h" #include "md5.h" #include <math.h> #include <stdio.h> diff --git a/util/message.cpp b/util/message.cpp index 24e2eed380a..a6d1bd27a5d 100644 --- a/util/message.cpp +++ b/util/message.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "message.h" #include <time.h> #include "../util/goodies.h" diff --git a/util/message_server.h b/util/message_server.h index cc40b7651ab..0ec220b61b3 100644 --- a/util/message_server.h +++ b/util/message_server.h @@ -22,7 +22,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" namespace mongo { diff --git a/util/message_server_port.cpp b/util/message_server_port.cpp index d61e6e1d706..08e5b8200e5 100644 --- a/util/message_server_port.cpp +++ b/util/message_server_port.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #ifndef USE_ASIO diff --git a/util/miniwebserver.cpp b/util/miniwebserver.cpp index 7b3b37d7383..29bc15839d6 100644 --- a/util/miniwebserver.cpp +++ b/util/miniwebserver.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "miniwebserver.h" #include "hex.h" diff --git a/util/miniwebserver.h b/util/miniwebserver.h index ae212eb065d..4c177e841c2 100644 --- a/util/miniwebserver.h +++ b/util/miniwebserver.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "message.h" #include "../db/jsobj.h" diff --git a/util/mmap.cpp b/util/mmap.cpp index 864b1d4d227..3ec9e307dc9 100644 --- a/util/mmap.cpp +++ b/util/mmap.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "mmap.h" #include "processinfo.h" #include "locks.h" diff --git a/util/mmap_posix.cpp b/util/mmap_posix.cpp index 4122ee7f7ba..50e9636cb71 100644 --- a/util/mmap_posix.cpp +++ b/util/mmap_posix.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "mmap.h" #include "file_allocator.h" diff --git a/util/mmap_win.cpp b/util/mmap_win.cpp index f4f1464bdba..62cd1f50898 100644 --- a/util/mmap_win.cpp +++ b/util/mmap_win.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "mmap.h" #include <windows.h> diff --git a/util/ntservice.cpp b/util/ntservice.cpp index bb2648575fb..68853ae8ea5 100644 --- a/util/ntservice.cpp +++ b/util/ntservice.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "ntservice.h" #if defined(_WIN32) diff --git a/util/processinfo_darwin.cpp b/util/processinfo_darwin.cpp index 2a92f312c6a..cb54bed1a42 100644 --- a/util/processinfo_darwin.cpp +++ b/util/processinfo_darwin.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "../stdafx.h" +#include "../pch.h" #include "processinfo.h" #include "log.h" diff --git a/util/processinfo_none.cpp b/util/processinfo_none.cpp index 9af1766a31c..b54cb13cdb4 100644 --- a/util/processinfo_none.cpp +++ b/util/processinfo_none.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "processinfo.h" #include <iostream> diff --git a/util/processinfo_win32.cpp b/util/processinfo_win32.cpp index 0705fcb4df2..5fc6ab51809 100644 --- a/util/processinfo_win32.cpp +++ b/util/processinfo_win32.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "processinfo.h" #include <iostream> diff --git a/util/queue.h b/util/queue.h index d48e0126a0e..b9fa73f1ac2 100644 --- a/util/queue.h +++ b/util/queue.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include "../util/goodies.h" #include <queue> diff --git a/util/ramstore.cpp b/util/ramstore.cpp index 031508289d7..0bdf2e21f76 100644 --- a/util/ramstore.cpp +++ b/util/ramstore.cpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "stdafx.h" +#include "pch.h" #include "mmap.h" namespace mongo { diff --git a/util/sock.cpp b/util/sock.cpp index 6b69506cd23..12732be5f08 100644 --- a/util/sock.cpp +++ b/util/sock.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "sock.h" namespace mongo { diff --git a/util/sock.h b/util/sock.h index f929f4d3a16..4b320b74352 100644 --- a/util/sock.h +++ b/util/sock.h @@ -17,7 +17,7 @@ #pragma once -#include "../stdafx.h" +#include "../pch.h" #include <stdio.h> #include <sstream> diff --git a/util/thread_pool.cpp b/util/thread_pool.cpp index 77d0d051afd..b381e3526f3 100644 --- a/util/thread_pool.cpp +++ b/util/thread_pool.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "thread_pool.h" #include "mvar.h" diff --git a/util/util.cpp b/util/util.cpp index ba28809aeed..63b2a7c5b2c 100644 --- a/util/util.cpp +++ b/util/util.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "stdafx.h" +#include "pch.h" #include "goodies.h" #include "unittest.h" #include "file_allocator.h" |