Permalink
Browse files

compile vs2010

  • Loading branch information...
1 parent 8254db5 commit ebdee89db06529edf56e996a122d8c984e595e58 @dwight dwight committed Jun 28, 2010
View
@@ -440,6 +440,8 @@
<ClCompile Include="..\util\concurrency\vars.cpp" />
<ClCompile Include="..\util\text.cpp" />
<ClCompile Include="..\util\version.cpp" />
+ <ClCompile Include="geo\2d.cpp" />
+ <ClCompile Include="geo\quadrant_search.cpp" />
<ClCompile Include="oplog.cpp" />
<ClCompile Include="repl.cpp" />
<ClCompile Include="repl\consensus.cpp" />
@@ -473,7 +475,6 @@
<ClCompile Include="dbwebserver.cpp" />
<ClCompile Include="extsort.cpp" />
<ClCompile Include="index.cpp" />
- <ClCompile Include="index_geo2d.cpp" />
<ClCompile Include="indexkey.cpp" />
<ClCompile Include="instance.cpp" />
<ClCompile Include="introspect.cpp" />
@@ -581,6 +582,7 @@
<ClInclude Include="..\util\mongoutils\str.h" />
<ClInclude Include="..\util\ramlog.h" />
<ClInclude Include="..\util\text.h" />
+ <ClInclude Include="geo\core.h" />
<ClInclude Include="helpers\dblogger.h" />
<ClInclude Include="repl.h" />
<ClInclude Include="replpair.h" />
@@ -715,9 +717,6 @@
<ItemGroup>
<ResourceCompile Include="db.rc" />
</ItemGroup>
- <ItemGroup>
- <Object Include="index_geo2d.obj" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
View
@@ -193,9 +193,6 @@
<ClCompile Include="index.cpp">
<Filter>db\core</Filter>
</ClCompile>
- <ClCompile Include="index_geo2d.cpp">
- <Filter>db\core</Filter>
- </ClCompile>
<ClCompile Include="indexkey.cpp">
<Filter>db\core</Filter>
</ClCompile>
@@ -343,6 +340,12 @@
<ClCompile Include="..\util\text.cpp">
<Filter>util\core</Filter>
</ClCompile>
+ <ClCompile Include="geo\2d.cpp">
+ <Filter>db\geo</Filter>
+ </ClCompile>
+ <ClCompile Include="geo\quadrant_search.cpp">
+ <Filter>db\geo</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="repl\rs_config.h">
@@ -705,6 +708,9 @@
<ClInclude Include="..\util\text.h">
<Filter>util\core</Filter>
</ClInclude>
+ <ClInclude Include="geo\core.h">
+ <Filter>db\geo</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="libs">
@@ -767,6 +773,9 @@
<Filter Include="bson">
<UniqueIdentifier>{aff20a87-2efe-4861-930f-8780c08cbea5}</UniqueIdentifier>
</Filter>
+ <Filter Include="db\geo">
+ <UniqueIdentifier>{2a0924a5-9bd9-4c86-a149-0df09dcb5548}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<None Include="repl\notes.txt">
@@ -816,9 +825,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <Object Include="index_geo2d.obj">
- <Filter>db\core</Filter>
- </Object>
- </ItemGroup>
</Project>
View
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../../pch.h"
+#include "pch.h"
#include "../namespace.h"
#include "../jsobj.h"
#include "../index.h"
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../../pch.h"
+#include "pch.h"
#include "../namespace.h"
#include "../jsobj.h"
#include "../index.h"
View
@@ -21,4 +21,5 @@
using namespace mongo;
using namespace mongo::regression;
+using boost::shared_ptr;
@@ -19,12 +19,10 @@
#include "pch.h"
#include "../db/queryoptimizer.h"
-
#include "../db/db.h"
#include "../db/dbhelpers.h"
#include "../db/instance.h"
#include "../db/query.h"
-
#include "dbtests.h"
namespace mongo {
@@ -1576,11 +1574,11 @@ namespace QueryOptimizerTests {
temp = BSON( "b" << 1 );
theDataFileMgr.insertWithObjMod( ns(), temp );
- shared_ptr< Cursor > c = bestGuessCursor( ns(), BSON( "b" << 1 ), BSON( "a" << 1 ) );
+ boost::shared_ptr< Cursor > c = bestGuessCursor( ns(), BSON( "b" << 1 ), BSON( "a" << 1 ) );
ASSERT_EQUALS( string( "a" ), c->indexKeyPattern().firstElement().fieldName() );
c = bestGuessCursor( ns(), BSON( "a" << 1 ), BSON( "b" << 1 ) );
ASSERT_EQUALS( string( "b" ), c->indexKeyPattern().firstElement().fieldName() );
- shared_ptr< MultiCursor > m = dynamic_pointer_cast< MultiCursor >( bestGuessCursor( ns(), fromjson( "{b:1,$or:[{z:1}]}" ), BSON( "a" << 1 ) ) );
+ boost::shared_ptr< MultiCursor > m = dynamic_pointer_cast< MultiCursor >( bestGuessCursor( ns(), fromjson( "{b:1,$or:[{z:1}]}" ), BSON( "a" << 1 ) ) );
ASSERT_EQUALS( string( "a" ), m->sub_c()->indexKeyPattern().firstElement().fieldName() );
m = dynamic_pointer_cast< MultiCursor >( bestGuessCursor( ns(), fromjson( "{a:1,$or:[{y:1}]}" ), BSON( "b" << 1 ) ) );
ASSERT_EQUALS( string( "b" ), m->sub_c()->indexKeyPattern().firstElement().fieldName() );
View
@@ -255,6 +255,8 @@
<ItemGroup>
<ClCompile Include="..\client\dbclientcursor.cpp" />
<ClCompile Include="..\client\gridfs.cpp" />
+ <ClCompile Include="..\db\geo\2d.cpp" />
+ <ClCompile Include="..\db\geo\quadrant_search.cpp" />
<ClCompile Include="..\db\repl\consensus.cpp" />
<ClCompile Include="..\db\repl\heartbeat.cpp" />
<ClCompile Include="..\db\repl\manager.cpp" />
@@ -525,7 +527,6 @@
<ClCompile Include="..\db\dbwebserver.cpp" />
<ClCompile Include="..\db\extsort.cpp" />
<ClCompile Include="..\db\index.cpp" />
- <ClCompile Include="..\db\index_geo2d.cpp" />
<ClCompile Include="..\db\indexkey.cpp" />
<ClCompile Include="..\db\instance.cpp" />
<ClCompile Include="..\db\introspect.cpp" />
@@ -383,9 +383,6 @@
<ClCompile Include="..\db\index.cpp">
<Filter>db\cpp</Filter>
</ClCompile>
- <ClCompile Include="..\db\index_geo2d.cpp">
- <Filter>db\cpp</Filter>
- </ClCompile>
<ClCompile Include="..\db\indexkey.cpp">
<Filter>db\cpp</Filter>
</ClCompile>
@@ -641,6 +638,12 @@
<ClCompile Include="..\s\d_state.cpp">
<Filter>shard</Filter>
</ClCompile>
+ <ClCompile Include="..\db\geo\2d.cpp">
+ <Filter>db\cpp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\db\geo\quadrant_search.cpp">
+ <Filter>db\cpp</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\SConstruct">

0 comments on commit ebdee89

Please sign in to comment.