diff options
-rw-r--r-- | db/db.vcproj | 4 | ||||
-rw-r--r-- | db/jsobj.h | 2 | ||||
-rw-r--r-- | jstests/cursor8.js | 3 | ||||
-rw-r--r-- | s/dbgrid.vcproj | 4 |
4 files changed, 12 insertions, 1 deletions
diff --git a/db/db.vcproj b/db/db.vcproj index 9724100ec40..9594f73e683 100644 --- a/db/db.vcproj +++ b/db/db.vcproj @@ -52,6 +52,7 @@ WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -130,6 +131,7 @@ PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -208,6 +210,7 @@ PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -287,6 +290,7 @@ WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/db/jsobj.h b/db/jsobj.h index 028bd7302b1..b551b4bf828 100644 --- a/db/jsobj.h +++ b/db/jsobj.h @@ -799,7 +799,7 @@ namespace mongo { const char * _fieldName; BSONObjBuilder * _builder; - bool haveSubobj() const { return _subobj.get(); } + bool haveSubobj() const { return _subobj.get() != 0; } BSONObjBuilder *subobj(); auto_ptr< BSONObjBuilder > _subobj; }; diff --git a/jstests/cursor8.js b/jstests/cursor8.js index 9d0eced80d2..169bb5d5deb 100644 --- a/jstests/cursor8.js +++ b/jstests/cursor8.js @@ -2,6 +2,9 @@ db.f.drop(); db.f.save( {} ); db.f.save( {} ); db.f.save( {} ); + +db.getMongo().getDB( "admin" ).runCommand( {closeAllDatabases:1} ); + assert.eq( 0, db.runCommand( {cursorInfo:1} ).clientCursors_size ); assert.eq( 2, db.f.find( {} ).limit( 2 ).toArray().length ); assert.eq( 1, db.runCommand( {cursorInfo:1} ).clientCursors_size ); diff --git a/s/dbgrid.vcproj b/s/dbgrid.vcproj index babafe606f7..fd5dcc7d560 100644 --- a/s/dbgrid.vcproj +++ b/s/dbgrid.vcproj @@ -50,6 +50,7 @@ PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -125,6 +126,7 @@ UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -202,6 +204,7 @@ UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -279,6 +282,7 @@ PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
DebugInformationFormat="4"
+ DisableSpecificWarnings="4355"
/>
<Tool
Name="VCManagedResourceCompilerTool"
|