mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Aaron 2009-05-28 13:35:53 -04:00
commit 7d117f2726
6 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -475,6 +475,11 @@ def doConfigure( myenv , needJava=True , needPcre=True , shell=False ):
myenv["LINKFLAGS_CLEAN"] = list( myenv["LINKFLAGS"] )
myenv["LIBS_CLEAN"] = list( myenv["LIBS"] )
if 'CheckCXX' in dir( conf ):
if not conf.CheckCXX():
print( "c++ compiler not installed!" )
Exit(1)
if nix and not shell:
if not conf.CheckLib( "stdc++" ):
print( "can't find stdc++ library which is needed" );

2
db/db.sln
View File

@ -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}"

34
db/db.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="db"
Name="mongod"
ProjectGUID="{215B2D68-0A70-4D10-8E75-B31010C62A91}"
RootNamespace="db"
Keyword="Win32Proj"
@ -1286,22 +1286,6 @@
</File>
</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"
>
@ -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"

6
s/dbgrid.vcproj
View File

@ -120,13 +120,13 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\pcre-7.4&quot;;&quot;c:\Program Files\boost\boost_1_35_0\&quot;"
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"

9
scripting/engine.cpp
View File

@ -37,10 +37,11 @@ namespace mongo {
File f;
f.open( filename.c_str() );
char * data = (char*)malloc( f.len() + 1 );
data[f.len()] = 0;
f.read( 0 , data , f.len() );
fileofs L = f.len();
assert( L <= 0x7ffffffe );
char * data = (char*)malloc( (size_t) L+1 );
data[L] = 0;
f.read( 0 , data , (size_t) L );
return exec( data , filename , printResult , reportError , assertOnError, timeoutMs );
}

2
util/mmap.cpp
View File

@ -58,7 +58,7 @@ namespace mongo {
void* MemoryMappedFile::map(const char *filename) {
boost::uintmax_t l = boost::filesystem::file_size( filename );
assert( l <= 0x7fffffff );
int i = l;
int i = (int) l;
return map( filename , i );
}