Merge branch 'master' of git.10gen.com:/data/gitroot/p

2 files changed, 3 insertions, 5 deletions

diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp
index 400c912038e..63a6e4d6fbb 100644
--- a/db/clientcursor.cpp
+++ b/db/clientcursor.cpp
@@ -186,8 +186,8 @@ namespace mongo {
             return new CursInspector();
         }
         void fill() {
-            b.append("byLocation_size", byLoc.size());
-            b.append("clientCursors_size", clientCursorsById.size());
+            b.append("byLocation_size", unsigned( byLoc.size() ) );
+            b.append("clientCursors_size", unsigned( clientCursorsById.size() ) );
             /* todo update for new impl:
             		stringstream ss;
             		ss << '\n';
diff --git a/util/top.h b/util/top.h
index 308adc26930..8a112816d4f 100644
--- a/util/top.h
+++ b/util/top.h
@@ -48,17 +48,15 @@ public:
         multimap< D, string, more > sorted;
         for( map< string, D >::iterator i = snapshot_.begin(); i != snapshot_.end(); ++i )
             sorted.insert( make_pair( i->second, i->first ) );
-        set< string > already;
         for( multimap< D, string, more >::iterator i = sorted.begin(); i != sorted.end(); ++i ) {
             Usage u;
-            already.insert( i->second );
             u.ns = i->second;
             u.time = totalUsage_[ u.ns ];
             u.pct = snapshotDuration_ != D() ? 100.0 * i->first.ticks() / snapshotDuration_.ticks() : 0;
             res.push_back( u );
         }
         for( map< string, D >::iterator i = totalUsage_.begin(); i != totalUsage_.end(); ++i ) {
-            if ( already.count( i->first ) != 0 )
+            if ( snapshot_.count( i->first ) != 0 )
                 continue;
             Usage u;
             u.ns = i->first;