diff options
Diffstat (limited to 'src/mongo/db/storage/mmap_v1')
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_interface.h | 2 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_logic.h | 30 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/btree/btree_test_help.h | 2 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/data_file_sync.h | 2 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/extent.h | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h index 2cc92060e0c..cb2cdd21125 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h @@ -45,6 +45,6 @@ namespace mongo { RecordStore* recordStore, SavedCursorRegistry* cursorRegistry, const Ordering& ordering, - const string& indexName, + const std::string& indexName, int version); } // namespace mongo diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h index c175b4efe0c..942f2b41365 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h @@ -79,7 +79,7 @@ namespace mongo { RecordStore* store, SavedCursorRegistry* cursors, const Ordering& ordering, - const string& indexName) + const std::string& indexName) : _headManager(head), _recordStore(store), _cursorRegistry(cursors), @@ -120,7 +120,7 @@ namespace mongo { DiskLoc _rightLeafLoc; // DiskLoc of right-most (highest) leaf bucket. bool _dupsAllowed; - auto_ptr<KeyDataOwnedType> _keyLast; + std::auto_ptr<KeyDataOwnedType> _keyLast; // Not owned. OperationContext* _txn; @@ -199,8 +199,8 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; void advanceTo(OperationContext*, @@ -209,8 +209,8 @@ namespace mongo { const BSONObj &keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; void restorePosition(OperationContext* txn, @@ -351,10 +351,10 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction, - pair<DiskLoc, int>& bestParent) const; + std::pair<DiskLoc, int>& bestParent) const; Status _find(OperationContext* txn, BucketType* bucket, @@ -370,13 +370,13 @@ namespace mongo { const BSONObj& keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, const Ordering& order, int direction, DiskLoc* thisLocInOut, int* keyOfsInOut, - pair<DiskLoc, int>& bestParent) const; + std::pair<DiskLoc, int>& bestParent) const; void advanceToImpl(OperationContext* txn, DiskLoc* thisLocInOut, @@ -384,8 +384,8 @@ namespace mongo { const BSONObj &keyBegin, int keyBeginLen, bool afterKey, - const vector<const BSONElement*>& keyEnd, - const vector<bool>& keyEndInclusive, + const std::vector<const BSONElement*>& keyEnd, + const std::vector<bool>& keyEndInclusive, int direction) const; bool wouldCreateDup(OperationContext* txn, @@ -597,7 +597,7 @@ namespace mongo { Ordering _ordering; - string _indexName; + std::string _indexName; }; } // namespace mongo diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h index 5e5d0df250b..b282e72d827 100644 --- a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h +++ b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h @@ -145,7 +145,7 @@ namespace mongo { bool isPresent(const BSONObj& key, int direction) const; - static string expectedKey(const char* spec); + static std::string expectedKey(const char* spec); OperationContext* _txn; BtreeLogicTestHelper<OnDiskFormat>* _helper; diff --git a/src/mongo/db/storage/mmap_v1/data_file_sync.h b/src/mongo/db/storage/mmap_v1/data_file_sync.h index 07341a8bb92..a92f55b64f8 100644 --- a/src/mongo/db/storage/mmap_v1/data_file_sync.h +++ b/src/mongo/db/storage/mmap_v1/data_file_sync.h @@ -41,7 +41,7 @@ namespace mongo { DataFileSync(); virtual bool includeByDefault() const { return true; } - virtual string name() const { return "DataFileSync"; } + virtual std::string name() const { return "DataFileSync"; } void run(); diff --git a/src/mongo/db/storage/mmap_v1/extent.h b/src/mongo/db/storage/mmap_v1/extent.h index e8ede6fe559..a25d34c49e0 100644 --- a/src/mongo/db/storage/mmap_v1/extent.h +++ b/src/mongo/db/storage/mmap_v1/extent.h @@ -71,7 +71,7 @@ namespace mongo { BSONObj dump() const; - void dump(iostream& s) const; + void dump(std::iostream& s) const; bool isOk() const { return magic == extentSignature; } void assertOk() const { verify(isOk()); } |