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

6 files changed, 31 insertions, 27 deletions

diff --git a/SConstruct b/SConstruct
index 8ba9c47ab9c..c1906f6c9c7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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" );
diff --git a/db/db.sln b/db/db.sln
index c8b0bb17ae1..9a7a0b24b43 100644
--- a/db/db.sln
+++ b/db/db.sln
@@ -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}"

diff --git a/db/db.vcproj b/db/db.vcproj
index db0b79b1e26..f413bfd6dec 100644
--- a/db/db.vcproj
+++ b/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"

@@ -1287,22 +1287,6 @@
 			</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"

 			>

 			<File

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

diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj
index f2fef641e99..dbe19550f63 100644
--- a/s/dbgrid.vcproj
+++ b/s/dbgrid.vcproj
@@ -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"

diff --git a/scripting/engine.cpp b/scripting/engine.cpp
index b355e65954a..33c0f400470 100644
--- a/scripting/engine.cpp
+++ b/scripting/engine.cpp
@@ -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 );
     }
diff --git a/util/mmap.cpp b/util/mmap.cpp
index 6b2ee813c33..feedd9645db 100644
--- a/util/mmap.cpp
+++ b/util/mmap.cpp
@@ -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 );
     }