mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
Windows:
db->mongod in vcproj suppress a couple warnings
This commit is contained in:
parent
787dc49f9d
commit
18285e76de
26
db/db.vcproj
26
db/db.vcproj
@ -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"
|
||||
@ -349,18 +349,6 @@
|
||||
RelativePath=".\db.rc"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\js\js\Debug\js.lib"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\js\js\Release\js.lib"
|
||||
>
|
||||
@ -381,6 +369,18 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\js\js\Debug\js.lib"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="C:\Program Files\Java\jdk\lib\jvm.lib"
|
||||
>
|
||||
|
@ -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 );
|
||||
}
|
||||
|
@ -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 );
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user