summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHari Khalsa <hkhalsa@10gen.com>2013-07-09 15:22:48 -0400
committerHari Khalsa <hkhalsa@10gen.com>2013-07-09 15:30:49 -0400
commitb918a9c83e0164ef610d3a0c45d4daa7f52ef20c (patch)
treef84a9812bedff9adcb17e23159b1cbc514603f76 /src
parent0e4a3a0c8439de066a09c3d17f1c23be85b49273 (diff)
downloadmongo-b918a9c83e0164ef610d3a0c45d4daa7f52ef20c.tar.gz
boost::shared_ptr instead of shared_ptr, SERVER-10026
Diffstat (limited to 'src')
-rw-r--r--src/mongo/SConscript2
-rw-r--r--src/mongo/dbtests/query_stage_fetch.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 180a8f05971..f8100ebe39b 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -720,7 +720,7 @@ env.StaticLibrary("serveronly", serverOnlyFiles,
"index_set",
'range_deleter',
's/metadata',
- "working_set",
+ "db/exec/working_set",
"writebatch",
"db/exec/exec",
'$BUILD_DIR/third_party/shim_snappy'])
diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp
index ab34f2823fb..d2a8f30b368 100644
--- a/src/mongo/dbtests/query_stage_fetch.cpp
+++ b/src/mongo/dbtests/query_stage_fetch.cpp
@@ -18,6 +18,8 @@
* This file tests db/exec/fetch.cpp. Fetch goes to disk so we cannot test outside of a dbtest.
*/
+#include <boost/shared_ptr.hpp>
+
#include "mongo/client/dbclientcursor.h"
#include "mongo/db/cursor.h"
#include "mongo/db/exec/fetch.h"
@@ -43,7 +45,7 @@ namespace QueryStageFetch {
}
void getLocs(set<DiskLoc>* out) {
- for (shared_ptr<Cursor> c = theDataFileMgr.findAll(ns()); c->ok(); c->advance()) {
+ for (boost::shared_ptr<Cursor> c = theDataFileMgr.findAll(ns()); c->ok(); c->advance()) {
out->insert(c->currLoc());
}
}