diff options
| -rw-r--r-- | db/db.sln | 1 | ||||
| -rw-r--r-- | db/db.vcproj | 16 | ||||
| -rw-r--r-- | s/shardkey.h | 1 | ||||
| -rw-r--r-- | scripting/engine.cpp | 1 | ||||
| -rw-r--r-- | scripting/engine_java.cpp | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/db/db.sln b/db/db.sln index 0b6a4028968..bd1e1f47507 100644 --- a/db/db.sln +++ b/db/db.sln @@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72E ProjectSection(SolutionItems) = preProject
..\dbtests\btreetests.cpp = ..\dbtests\btreetests.cpp
..\dbtests\dbtests.cpp = ..\dbtests\dbtests.cpp
- ..\dbtests\javajstests.cpp = ..\dbtests\javajstests.cpp
..\dbtests\jsontests.cpp = ..\dbtests\jsontests.cpp
..\dbtests\matchertests.cpp = ..\dbtests\matchertests.cpp
..\dbtests\pairingtests.cpp = ..\dbtests\pairingtests.cpp
diff --git a/db/db.vcproj b/db/db.vcproj index 2cbcbf42167..c3f37443297 100644 --- a/db/db.vcproj +++ b/db/db.vcproj @@ -1499,10 +1499,6 @@ >
</File>
<File
- RelativePath=".\javajs.cpp"
- >
- </File>
- <File
RelativePath=".\jsobj.cpp"
>
</File>
@@ -1766,6 +1762,18 @@ >
</File>
</Filter>
+ <Filter
+ Name="scripting"
+ >
+ <File
+ RelativePath="..\scripting\engine.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\scripting\engine_java.cpp"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
diff --git a/s/shardkey.h b/s/shardkey.h index 3abd3be1dd1..cc44b230bf9 100644 --- a/s/shardkey.h +++ b/s/shardkey.h @@ -56,7 +56,6 @@ namespace mongo { return isGlobalMin( k ) || isGlobalMax( k ); } - /** @return the key central between min and max note: min and max could cross type boundaries diff --git a/scripting/engine.cpp b/scripting/engine.cpp index 16870aaa7d6..86c56e6e752 100644 --- a/scripting/engine.cpp +++ b/scripting/engine.cpp @@ -1,5 +1,6 @@ // engine.cpp +#include "stdafx.h" #include "engine.h" namespace mongo { diff --git a/scripting/engine_java.cpp b/scripting/engine_java.cpp index 1384fb23f6e..8d88b64acb5 100644 --- a/scripting/engine_java.cpp +++ b/scripting/engine_java.cpp @@ -43,7 +43,7 @@ namespace mongo { #include "../util/message.h" -#include "db.h" +#include "../db/db.h" using namespace std; |