Permalink
Browse files

Merge commit 'alanw/master'

Conflicts:

	db/db.cpp
	msvc/server_only/server_only.vcproj
	stdafx.cpp
	util/log.h
  • Loading branch information...
2 parents ab05b87 + 6d446d4 commit 905f018510bd388c0f101d23806b974dd0faea52 @erh erh committed Jun 8, 2009
View
@@ -185,7 +185,7 @@ if ( not ( usesm or usejvm ) ):
# ------ SOURCE FILE SETUP -----------
commonFiles = Split( "stdafx.cpp buildinfo.cpp db/jsobj.cpp db/json.cpp db/commands.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" )
-commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" ]
+commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" , "util/assert_util.cpp" ]
commonFiles += Glob( "util/*.c" )
commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/model.cpp" )
commonFiles += [ "scripting/engine.cpp" ]
@@ -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>
View
@@ -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>
@@ -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
@@ -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>
@@ -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>
View
@@ -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>
@@ -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>
@@ -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>
Oops, something went wrong.

0 comments on commit 905f018

Please sign in to comment.