From f2bfd36a6f3eb7e7e2587268be3cc12636703d42 Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Mon, 19 May 2014 12:46:52 -0400
Subject: SERVER-13256: Remove pch - qualify std in headers

---
 src/mongo/client/dbclientcursor.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/mongo/client/dbclientcursor.h')

diff --git a/src/mongo/client/dbclientcursor.h b/src/mongo/client/dbclientcursor.h
index 2bcc8411049..527829a42ea 100644
--- a/src/mongo/client/dbclientcursor.h
+++ b/src/mongo/client/dbclientcursor.h
@@ -73,7 +73,7 @@ namespace mongo {
         /** next
            @return next object in the result cursor.
            on an error at the remote server, you will get back:
-             { $err: <string> }
+             { $err: <std::string> }
            if you do not want to handle that yourself, call nextSafe().
 
            Warning: The returned BSONObj will become invalid after the next batch
@@ -90,7 +90,7 @@ namespace mongo {
         BSONObj nextSafe() {
             BSONObj o = next();
             if( strcmp(o.firstElementFieldName(), "$err") == 0 ) {
-                string s = "nextSafe(): " + o.toString();
+                std::string s = "nextSafe(): " + o.toString();
                 LOG(5) << s;
                 uasserted(13106, s);
             }
@@ -102,7 +102,7 @@ namespace mongo {
             with what is already buffered.
             WARNING: no support for _putBack yet!
         */
-        void peek(vector<BSONObj>&, int atMost);
+        void peek(std::vector<BSONObj>&, int atMost);
 
         // Peeks at first element, if exists
         BSONObj peekFirst();
@@ -145,7 +145,7 @@ namespace mongo {
         /// Change batchSize after construction. Can change after requesting first batch.
         void setBatchSize(int newBatchSize) { batchSize = newBatchSize; }
 
-        DBClientCursor( DBClientBase* client, const string &_ns, BSONObj _query, int _nToReturn,
+        DBClientCursor( DBClientBase* client, const std::string &_ns, BSONObj _query, int _nToReturn,
                         int _nToSkip, const BSONObj *_fieldsToReturn, int queryOptions , int bs ) :
             _client(client),
             ns(_ns),
@@ -163,7 +163,7 @@ namespace mongo {
             _finishConsInit();
         }
 
-        DBClientCursor( DBClientBase* client, const string &_ns, long long _cursorId, int _nToReturn, int options ) :
+        DBClientCursor( DBClientBase* client, const std::string &_ns, long long _cursorId, int _nToReturn, int options ) :
             _client(client),
             ns(_ns),
             nToReturn( _nToReturn ),
@@ -190,9 +190,9 @@ namespace mongo {
 
         void attach( AScopedConnection * conn );
 
-        string originalHost() const { return _originalHost; }
+        std::string originalHost() const { return _originalHost; }
 
-        string getns() const { return ns; }
+        std::string getns() const { return ns; }
 
         Message* getMessage(){ return batch.m.get(); }
 
@@ -216,7 +216,7 @@ namespace mongo {
 
         class Batch : boost::noncopyable {
             friend class DBClientCursor;
-            auto_ptr<Message> m;
+            std::auto_ptr<Message> m;
             int nReturned;
             int pos;
             const char *data;
@@ -233,8 +233,8 @@ namespace mongo {
 
         Batch batch;
         DBClientBase* _client;
-        string _originalHost;
-        string ns;
+        std::string _originalHost;
+        std::string ns;
         BSONObj query;
         int nToReturn;
         bool haveLimit;
@@ -242,16 +242,16 @@ namespace mongo {
         const BSONObj *fieldsToReturn;
         int opts;
         int batchSize;
-        stack< BSONObj > _putBack;
+        std::stack< BSONObj > _putBack;
         int resultFlags;
         long long cursorId;
         bool _ownCursor; // see decouple()
-        string _scopedHost;
-        string _lazyHost;
+        std::string _scopedHost;
+        std::string _lazyHost;
         bool wasError;
 
-        void dataReceived() { bool retry; string lazyHost; dataReceived( retry, lazyHost ); }
-        void dataReceived( bool& retry, string& lazyHost );
+        void dataReceived() { bool retry; std::string lazyHost; dataReceived( retry, lazyHost ); }
+        void dataReceived( bool& retry, std::string& lazyHost );
         void requestMore();
         void exhaustReceiveMore(); // for exhaust
 
-- 
cgit v1.2.1