summaryrefslogtreecommitdiff
path: root/src/mongo/db/stats
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/stats')
-rw-r--r--src/mongo/db/stats/service_stats.h4
-rw-r--r--src/mongo/db/stats/snapshots.h6
-rw-r--r--src/mongo/db/stats/top.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/stats/service_stats.h b/src/mongo/db/stats/service_stats.h
index da8b121aa55..168a7f104ac 100644
--- a/src/mongo/db/stats/service_stats.h
+++ b/src/mongo/db/stats/service_stats.h
@@ -59,10 +59,10 @@ namespace mongo {
void logResponse( uint64_t duration, uint64_t bytes );
/**
- * Render the histogram as string that can be used inside an
+ * Render the histogram as std::string that can be used inside an
* HTML doc.
*/
- string toHTML() const;
+ std::string toHTML() const;
private:
SpinLock _spinLock; // protects state below
diff --git a/src/mongo/db/stats/snapshots.h b/src/mongo/db/stats/snapshots.h
index 9ea639a6fc8..29c8fc5bdfe 100644
--- a/src/mongo/db/stats/snapshots.h
+++ b/src/mongo/db/stats/snapshots.h
@@ -101,10 +101,10 @@ namespace mongo {
int numDeltas() const { return _stored-1; }
const SnapshotData& getPrev( int numBack = 0 );
- auto_ptr<SnapshotDelta> computeDelta( int numBack = 0 );
+ std::auto_ptr<SnapshotDelta> computeDelta( int numBack = 0 );
- void outputLockInfoHTML( stringstream& ss );
+ void outputLockInfoHTML( std::stringstream& ss );
private:
mongo::mutex _lock;
int _n;
@@ -115,7 +115,7 @@ namespace mongo {
class SnapshotThread : public BackgroundJob {
public:
- virtual string name() const { return "snapshot"; }
+ virtual std::string name() const { return "snapshot"; }
void run();
};
diff --git a/src/mongo/db/stats/top.h b/src/mongo/db/stats/top.h
index 9ab16ade79e..a90b1503e81 100644
--- a/src/mongo/db/stats/top.h
+++ b/src/mongo/db/stats/top.h
@@ -96,7 +96,7 @@ namespace mongo {
mutable SimpleMutex _lock;
CollectionData _global;
UsageMap _usage;
- string _lastDropped;
+ std::string _lastDropped;
};
} // namespace mongo