diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-06-06 08:02:38 -0400 |
---|---|---|
committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-06-06 17:24:22 -0400 |
commit | 7a95cbf89f27abc0b2fb494da4c40efd59a3e1da (patch) | |
tree | 59f6d12c8a6f755a681eaca12abdc09dc64e4de3 /src | |
parent | 52bdc0125ac6ea0336f3da61bbfc8b0e92d9f6e5 (diff) | |
download | mongo-7a95cbf89f27abc0b2fb494da4c40efd59a3e1da.tar.gz |
SERVER-8994: Build fixes for boost 1.55.0 with gcc & msvc
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/exec/working_set.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/pipeline/document_source_cursor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/pipeline/document_source_sort.cpp | 2 | ||||
-rw-r--r-- | src/mongo/s/chunk_manager_targeter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/working_set.cpp b/src/mongo/db/exec/working_set.cpp index 3d268cfde28..8cfcd0f9d70 100644 --- a/src/mongo/db/exec/working_set.cpp +++ b/src/mongo/db/exec/working_set.cpp @@ -119,7 +119,7 @@ namespace mongo { } bool WorkingSetMember::hasComputed(const WorkingSetComputedDataType type) const { - return _computed[type]; + return _computed[type].get(); } const WorkingSetComputedData* WorkingSetMember::getComputed(const WorkingSetComputedDataType type) const { diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index de7e49192b5..05b384fd3a6 100644 --- a/src/mongo/db/pipeline/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp @@ -141,7 +141,7 @@ namespace mongo { if (!_limit) { _limit = dynamic_cast<DocumentSourceLimit*>(nextSource.get()); - return _limit; // false if next is not a $limit + return _limit.get(); // false if next is not a $limit } else { return _limit->coalesce(nextSource); diff --git a/src/mongo/db/pipeline/document_source_sort.cpp b/src/mongo/db/pipeline/document_source_sort.cpp index fc47b80ec48..0a51b8b5b28 100644 --- a/src/mongo/db/pipeline/document_source_sort.cpp +++ b/src/mongo/db/pipeline/document_source_sort.cpp @@ -92,7 +92,7 @@ namespace mongo { bool DocumentSourceSort::coalesce(const intrusive_ptr<DocumentSource> &pNextSource) { if (!limitSrc) { limitSrc = dynamic_cast<DocumentSourceLimit*>(pNextSource.get()); - return limitSrc; // false if next is not a $limit + return limitSrc.get(); // false if next is not a $limit } else { return limitSrc->coalesce(pNextSource); diff --git a/src/mongo/s/chunk_manager_targeter.cpp b/src/mongo/s/chunk_manager_targeter.cpp index e07cdc83324..6c03eb96376 100644 --- a/src/mongo/s/chunk_manager_targeter.cpp +++ b/src/mongo/s/chunk_manager_targeter.cpp @@ -48,7 +48,7 @@ namespace mongo { *errMsg = ex.toString(); } - return config; + return config.get(); } ChunkManagerTargeter::ChunkManagerTargeter() : |