diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2009-12-30 12:13:25 -0500 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2009-12-30 12:13:25 -0500 |
| commit | c2004aeb45874cb2b98a89ae76b80b6173d63720 (patch) | |
| tree | 9f1885678b60604ffb03d09cf35a82a4c28bb510 | |
| parent | cdda7a23e4901e4074b4a13bfc1c5e1da3d9d367 (diff) | |
| parent | b88f54e21973f639858148a6add41d43c9bbdffa (diff) | |
| download | mongo-c2004aeb45874cb2b98a89ae76b80b6173d63720.tar.gz | |
Merge branch 'master' of git@github.com:mongodb/mongo
| -rw-r--r-- | db/curop.h | 4 | ||||
| -rw-r--r-- | db/db.vcproj | 28 | ||||
| -rw-r--r-- | dbtests/test.vcproj | 28 | ||||
| -rw-r--r-- | s/dbgrid.vcproj | 4 | ||||
| -rw-r--r-- | util/builder.h | 2 |
5 files changed, 39 insertions, 27 deletions
diff --git a/db/curop.h b/db/curop.h index 0bf5b4664f7..8a28f4f10e6 100644 --- a/db/curop.h +++ b/db/curop.h @@ -8,8 +8,8 @@ namespace mongo { - struct OpDebug { - + class OpDebug { + public: StringBuilder str; void reset(){ diff --git a/db/db.vcproj b/db/db.vcproj index 1d45425368a..4fe4886ae05 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
@@ -1515,6 +1515,10 @@ >
</File>
<File
+ RelativePath=".\database.cpp"
+ >
+ </File>
+ <File
RelativePath=".\db.cpp"
>
</File>
@@ -1535,10 +1539,6 @@ >
</File>
<File
- RelativePath=".\dbinfo.cpp"
- >
- </File>
- <File
RelativePath=".\dbwebserver.cpp"
>
</File>
@@ -1663,6 +1663,10 @@ >
</File>
<File
+ RelativePath="..\util\top.cpp"
+ >
+ </File>
+ <File
RelativePath=".\update.cpp"
>
</File>
diff --git a/dbtests/test.vcproj b/dbtests/test.vcproj index bb6a3383235..0e76d1e9a3f 100644 --- a/dbtests/test.vcproj +++ b/dbtests/test.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
@@ -1495,19 +1495,19 @@ >
</File>
<File
- RelativePath="..\db\dbcommands.cpp"
+ RelativePath="..\db\database.cpp"
>
</File>
<File
- RelativePath="..\db\dbeval.cpp"
+ RelativePath="..\db\dbcommands.cpp"
>
</File>
<File
- RelativePath="..\db\dbhelpers.cpp"
+ RelativePath="..\db\dbeval.cpp"
>
</File>
<File
- RelativePath="..\db\dbinfo.cpp"
+ RelativePath="..\db\dbhelpers.cpp"
>
</File>
<File
@@ -1619,6 +1619,10 @@ >
</File>
<File
+ RelativePath="..\util\top.cpp"
+ >
+ </File>
+ <File
RelativePath="..\db\update.cpp"
>
</File>
diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj index 979b76abcbe..2c8ef85a4bf 100644 --- a/s/dbgrid.vcproj +++ b/s/dbgrid.vcproj @@ -545,6 +545,10 @@ >
</File>
<File
+ RelativePath="..\util\thread_pool.cpp"
+ >
+ </File>
+ <File
RelativePath="..\util\util.cpp"
>
</File>
diff --git a/util/builder.h b/util/builder.h index 72803c46931..4c45f88b87b 100644 --- a/util/builder.h +++ b/util/builder.h @@ -17,7 +17,7 @@ #pragma once -#include "stdafx.h" +#include "../stdafx.h" #include <string.h> namespace mongo { |