Merge commit 'alanw/master'

Conflicts:

	db/db.cpp
	msvc/server_only/server_only.vcproj
	stdafx.cpp
	util/log.h

13 files changed, 332 insertions, 24 deletions

diff --git a/msvc/core_server/core_server.vcproj b/msvc/core_server/core_server.vcproj
index 6ac3aa669e6..5def1339cfc 100644
--- a/msvc/core_server/core_server.vcproj
+++ b/msvc/core_server/core_server.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -113,7 +113,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -210,6 +210,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongo/mongo.vcproj b/msvc/mongo/mongo.vcproj
index 1b96fd17a2d..1dd951d27d8 100644
--- a/msvc/mongo/mongo.vcproj
+++ b/msvc/mongo/mongo.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -282,6 +282,30 @@
 				</FileConfiguration>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongo_common/mongo_common.vcproj b/msvc/mongo_common/mongo_common.vcproj
index 7883419cde5..e1077239a0d 100644
--- a/msvc/mongo_common/mongo_common.vcproj
+++ b/msvc/mongo_common/mongo_common.vcproj
@@ -790,6 +790,18 @@
 			Name="util"

 			>

 			<File

+				RelativePath="..\..\util\allocator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\util\assert_util.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\util\assert_util.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\util\background.cpp"

 				>

 			</File>

@@ -798,6 +810,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\util\debug_util.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\util\goodies.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\util\md5.c"

 				>

 				<FileConfiguration

diff --git a/msvc/mongobridge/mongobridge.vcproj b/msvc/mongobridge/mongobridge.vcproj
index 1b2115c7ae0..250f5693d62 100644
--- a/msvc/mongobridge/mongobridge.vcproj
+++ b/msvc/mongobridge/mongobridge.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongoclient/mongoclient.vcproj b/msvc/mongoclient/mongoclient.vcproj
index f3b3faea1b7..ad2703cc380 100644
--- a/msvc/mongoclient/mongoclient.vcproj
+++ b/msvc/mongoclient/mongoclient.vcproj
@@ -46,7 +46,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -111,7 +111,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -210,6 +210,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongod/mongod.vcproj b/msvc/mongod/mongod.vcproj
index 7bc0f21e854..4ff3db088e7 100644
--- a/msvc/mongod/mongod.vcproj
+++ b/msvc/mongod/mongod.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -127,7 +127,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -202,6 +202,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongodump/mongodump.vcproj b/msvc/mongodump/mongodump.vcproj
index 8b3408a3778..7d331b055e6 100644
--- a/msvc/mongodump/mongodump.vcproj
+++ b/msvc/mongodump/mongodump.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongoexport/mongoexport.vcproj b/msvc/mongoexport/mongoexport.vcproj
index 375e45d32e3..0225031205e 100644
--- a/msvc/mongoexport/mongoexport.vcproj
+++ b/msvc/mongoexport/mongoexport.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongofiles/mongofiles.vcproj b/msvc/mongofiles/mongofiles.vcproj
index 604075b3b18..a36f4421067 100644
--- a/msvc/mongofiles/mongofiles.vcproj
+++ b/msvc/mongofiles/mongofiles.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongoimportjson/mongoimportjson.vcproj b/msvc/mongoimportjson/mongoimportjson.vcproj
index 1c292477a10..f2b2f7f8b0f 100644
--- a/msvc/mongoimportjson/mongoimportjson.vcproj
+++ b/msvc/mongoimportjson/mongoimportjson.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongorestore/mongorestore.vcproj b/msvc/mongorestore/mongorestore.vcproj
index 54117b10fc2..e40ea927e93 100644
--- a/msvc/mongorestore/mongorestore.vcproj
+++ b/msvc/mongorestore/mongorestore.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -125,7 +125,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -266,6 +266,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/mongos/mongos.vcproj b/msvc/mongos/mongos.vcproj
index 0ad3ca05699..058fa1ee375 100644
--- a/msvc/mongos/mongos.vcproj
+++ b/msvc/mongos/mongos.vcproj
@@ -46,7 +46,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -122,7 +122,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -198,6 +198,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/msvc/shard_server/shard_server.vcproj b/msvc/shard_server/shard_server.vcproj
index 1335b321d5f..e2089033b74 100644
--- a/msvc/shard_server/shard_server.vcproj
+++ b/msvc/shard_server/shard_server.vcproj
@@ -47,7 +47,7 @@
 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="4"

 			/>

@@ -113,7 +113,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

 				DebugInformationFormat="3"

 			/>

@@ -232,6 +232,30 @@
 				>

 			</File>

 		</Filter>

+		<Filter

+			Name="Source Files"

+			>

+			<File

+				RelativePath="..\..\stdafx.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						UsePrecompiledHeader="1"

+					/>

+				</FileConfiguration>

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>