diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2009-05-28 13:16:22 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2009-05-28 13:16:22 -0400 |
| commit | 160e13e2e3743814d1b8984fc7441a49b575e82e (patch) | |
| tree | 4b9137ad407a57ff3b466ab9404a2a69e9f49d97 | |
| parent | 2df26bc7569b113eb9c6fa961e878493ec3ce3d1 (diff) | |
| parent | 787dc49f9d9c7693c783a0976d2aa038820bbea2 (diff) | |
| download | mongo-160e13e2e3743814d1b8984fc7441a49b575e82e.tar.gz | |
Merge branch 'master' of git@github.com:mongodb/mongo
| -rw-r--r-- | db/db.sln | 2 | ||||
| -rw-r--r-- | db/db.vcproj | 48 | ||||
| -rw-r--r-- | s/dbgrid.vcproj | 6 |
3 files changed, 27 insertions, 29 deletions
diff --git a/db/db.sln b/db/db.sln index c8b0bb17ae1..9a7a0b24b43 100644 --- a/db/db.sln +++ b/db/db.sln @@ -15,7 +15,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72EBEDD-342D-4371-8B0D-D7505902FA69}"
ProjectSection(SolutionItems) = preProject
..\dbtests\btreetests.cpp = ..\dbtests\btreetests.cpp
- ..\dbtests\dbtests.cpp = ..\dbtests\dbtests.cpp
..\dbtests\jsontests.cpp = ..\dbtests\jsontests.cpp
..\dbtests\matchertests.cpp = ..\dbtests\matchertests.cpp
..\dbtests\pairingtests.cpp = ..\dbtests\pairingtests.cpp
@@ -32,7 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59 ..\tools\files.cpp = ..\tools\files.cpp
..\tools\importJSON.cpp = ..\tools\importJSON.cpp
..\tools\restore.cpp = ..\tools\restore.cpp
- ..\tools\Tool.cpp = ..\tools\Tool.cpp
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongos", "..\s\dbgrid.vcproj", "{E03717ED-69B4-4D21-BC55-DF6690B585C6}"
diff --git a/db/db.vcproj b/db/db.vcproj index db0b79b1e26..9675a9a3d6f 100644 --- a/db/db.vcproj +++ b/db/db.vcproj @@ -350,30 +350,30 @@ >
</File>
<File
- RelativePath="..\..\js\js\Release\js.lib"
+ RelativePath="..\..\js\js\Debug\js.lib"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\js\js\Release\js.lib"
+ >
<FileConfiguration
- Name="Debug Recstore|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
- </File>
- <File
- RelativePath="..\..\js\js\Debug\js.lib"
- >
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug Recstore|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -1287,22 +1287,6 @@ </Filter>
</Filter>
<Filter
- Name="btree related"
- >
- <File
- RelativePath=".\btree.cpp"
- >
- </File>
- <File
- RelativePath=".\btree.h"
- >
- </File>
- <File
- RelativePath=".\btreecursor.cpp"
- >
- </File>
- </Filter>
- <Filter
Name="storage related"
>
<File
@@ -1357,6 +1341,22 @@ RelativePath="..\client\model.h"
>
</File>
+ <Filter
+ Name="btree related"
+ >
+ <File
+ RelativePath=".\btree.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\btree.h"
+ >
+ </File>
+ <File
+ RelativePath=".\btreecursor.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="db"
diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj index f2fef641e99..dbe19550f63 100644 --- a/s/dbgrid.vcproj +++ b/s/dbgrid.vcproj @@ -120,13 +120,13 @@ Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories=""..\pcre-7.4";"c:\Program Files\boost\boost_1_35_0\""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC"
+ PreprocessorDefinitions="USE_ASIO;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PCRE_STATIC"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
- DisableSpecificWarnings="4355"
+ DisableSpecificWarnings="4355;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -282,7 +282,7 @@ PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="4"
- DisableSpecificWarnings="4355"
+ DisableSpecificWarnings="4355;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
|