summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r--src/mongo/dbtests/basictests.cpp3
-rw-r--r--src/mongo/dbtests/chunktests.cpp2
-rw-r--r--src/mongo/dbtests/dbtests.h3
-rw-r--r--src/mongo/dbtests/documentsourcetests.cpp5
-rw-r--r--src/mongo/dbtests/mock/mock_dbclient_connection.h1
-rw-r--r--src/mongo/dbtests/mock/mock_remote_db_server.h3
-rw-r--r--src/mongo/dbtests/perftests.cpp7
-rw-r--r--src/mongo/dbtests/query_plan_executor.cpp5
-rw-r--r--src/mongo/dbtests/query_stage_and.cpp3
-rw-r--r--src/mongo/dbtests/query_stage_count_scan.cpp3
-rw-r--r--src/mongo/dbtests/query_stage_fetch.cpp3
-rw-r--r--src/mongo/dbtests/query_stage_keep.cpp3
-rw-r--r--src/mongo/dbtests/query_stage_near.cpp3
-rw-r--r--src/mongo/dbtests/sharding.cpp5
14 files changed, 18 insertions, 31 deletions
diff --git a/src/mongo/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp
index 907389d3403..cfafc97fc0f 100644
--- a/src/mongo/dbtests/basictests.cpp
+++ b/src/mongo/dbtests/basictests.cpp
@@ -31,7 +31,6 @@
#include "mongo/platform/basic.h"
-#include <boost/shared_ptr.hpp>
#include <iostream>
#include "mongo/db/operation_context_impl.h"
@@ -48,7 +47,7 @@
namespace BasicTests {
using std::unique_ptr;
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::cout;
using std::dec;
using std::endl;
diff --git a/src/mongo/dbtests/chunktests.cpp b/src/mongo/dbtests/chunktests.cpp
index 90bd6480903..aa86f53ebec 100644
--- a/src/mongo/dbtests/chunktests.cpp
+++ b/src/mongo/dbtests/chunktests.cpp
@@ -59,7 +59,7 @@ namespace mongo {
Shard shard(shardId, ConnectionString(HostAndPort(shardId)));
Shard::installShard(shardId, shard);
- boost::shared_ptr<Chunk> chunk(new Chunk(this,
+ std::shared_ptr<Chunk> chunk(new Chunk(this,
mySplitPoints[i - 1],
mySplitPoints[i],
shardId));
diff --git a/src/mongo/dbtests/dbtests.h b/src/mongo/dbtests/dbtests.h
index a3996b2e37a..d6c1e089bb2 100644
--- a/src/mongo/dbtests/dbtests.h
+++ b/src/mongo/dbtests/dbtests.h
@@ -31,14 +31,13 @@
#pragma once
-#include <boost/shared_ptr.hpp>
#include "mongo/db/instance.h"
#include "mongo/unittest/unittest.h"
using namespace mongo;
using namespace mongo::unittest;
-using boost::shared_ptr;
+using std::shared_ptr;
namespace mongo {
class BSONObj;
diff --git a/src/mongo/dbtests/documentsourcetests.cpp b/src/mongo/dbtests/documentsourcetests.cpp
index 8785cb312cb..07e4d2f840b 100644
--- a/src/mongo/dbtests/documentsourcetests.cpp
+++ b/src/mongo/dbtests/documentsourcetests.cpp
@@ -30,7 +30,6 @@
#include "mongo/platform/basic.h"
-#include <boost/shared_ptr.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
@@ -49,7 +48,7 @@
namespace DocumentSourceTests {
using boost::intrusive_ptr;
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::map;
using std::set;
using std::string;
@@ -204,7 +203,7 @@ namespace DocumentSourceTests {
private:
// It is important that these are ordered to ensure correct destruction order.
- boost::shared_ptr<PlanExecutor> _exec;
+ std::shared_ptr<PlanExecutor> _exec;
intrusive_ptr<ExpressionContext> _ctx;
intrusive_ptr<DocumentSourceCursor> _source;
};
diff --git a/src/mongo/dbtests/mock/mock_dbclient_connection.h b/src/mongo/dbtests/mock/mock_dbclient_connection.h
index 38016a0eb8e..8bd045f0dd4 100644
--- a/src/mongo/dbtests/mock/mock_dbclient_connection.h
+++ b/src/mongo/dbtests/mock/mock_dbclient_connection.h
@@ -27,7 +27,6 @@
#pragma once
-#include <boost/shared_ptr.hpp>
#include <string>
#include <vector>
diff --git a/src/mongo/dbtests/mock/mock_remote_db_server.h b/src/mongo/dbtests/mock/mock_remote_db_server.h
index aded4542d31..f037163b2d0 100644
--- a/src/mongo/dbtests/mock/mock_remote_db_server.h
+++ b/src/mongo/dbtests/mock/mock_remote_db_server.h
@@ -27,7 +27,6 @@
#pragma once
-#include <boost/shared_ptr.hpp>
#include <string>
#include <vector>
@@ -210,7 +209,7 @@ namespace mongo {
*/
void checkIfUp(InstanceID id) const;
- typedef unordered_map<std::string, boost::shared_ptr<CircularBSONIterator> > CmdToReplyObj;
+ typedef unordered_map<std::string, std::shared_ptr<CircularBSONIterator> > CmdToReplyObj;
typedef unordered_map<std::string, std::vector<BSONObj> > MockDataMgr;
bool _isRunning;
diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index 20041d7b2c2..012f8bfab94 100644
--- a/src/mongo/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
@@ -39,7 +39,6 @@
#include "mongo/platform/basic.h"
#include <boost/filesystem/operations.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp>
#include <boost/version.hpp>
@@ -73,7 +72,7 @@
namespace PerfTests {
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::cout;
using std::endl;
using std::fixed;
@@ -120,7 +119,7 @@ namespace PerfTests {
in ./../settings.py:
pstatspassword="<pwd>"
*/
- static boost::shared_ptr<DBClientConnection> conn;
+ static std::shared_ptr<DBClientConnection> conn;
static string _perfhostname;
void pstatsConnect() {
// no writing to perf db if this is a debug build
@@ -154,7 +153,7 @@ namespace PerfTests {
}
}
- boost::shared_ptr<DBClientConnection> c(new DBClientConnection(false, 60));
+ std::shared_ptr<DBClientConnection> c(new DBClientConnection(false, 60));
string err;
if( c->connect(HostAndPort("perfdb.10gen.cc"), err) ) {
if( !c->auth("perf", "perf", pwd, err) ) {
diff --git a/src/mongo/dbtests/query_plan_executor.cpp b/src/mongo/dbtests/query_plan_executor.cpp
index 137ee3b9984..e285e3919cb 100644
--- a/src/mongo/dbtests/query_plan_executor.cpp
+++ b/src/mongo/dbtests/query_plan_executor.cpp
@@ -26,7 +26,6 @@
* then also delete it in the license file.
*/
-#include <boost/shared_ptr.hpp>
#include "mongo/db/catalog/collection.h"
#include "mongo/db/catalog/database.h"
@@ -51,7 +50,7 @@
namespace QueryPlanExecutor {
using std::unique_ptr;
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::unique_ptr;
using std::string;
@@ -269,7 +268,7 @@ namespace QueryPlanExecutor {
addIndex(indexSpec);
// Create the PlanExecutor which feeds the aggregation pipeline.
- boost::shared_ptr<PlanExecutor> innerExec(
+ std::shared_ptr<PlanExecutor> innerExec(
makeIndexScanExec(ctx.db(), indexSpec, 7, 10));
// Create the aggregation pipeline.
diff --git a/src/mongo/dbtests/query_stage_and.cpp b/src/mongo/dbtests/query_stage_and.cpp
index 5b421b5807a..0f70fa6aa5b 100644
--- a/src/mongo/dbtests/query_stage_and.cpp
+++ b/src/mongo/dbtests/query_stage_and.cpp
@@ -31,7 +31,6 @@
* so we cannot test it outside of a dbtest.
*/
-#include <boost/shared_ptr.hpp>
#include "mongo/client/dbclientcursor.h"
#include "mongo/db/catalog/collection.h"
@@ -54,7 +53,7 @@
namespace QueryStageAnd {
using std::unique_ptr;
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::unique_ptr;
using std::set;
diff --git a/src/mongo/dbtests/query_stage_count_scan.cpp b/src/mongo/dbtests/query_stage_count_scan.cpp
index 523bde78664..7c20f44b605 100644
--- a/src/mongo/dbtests/query_stage_count_scan.cpp
+++ b/src/mongo/dbtests/query_stage_count_scan.cpp
@@ -26,7 +26,6 @@
* then also delete it in the license file.
*/
-#include <boost/shared_ptr.hpp>
#include "mongo/client/dbclientcursor.h"
#include "mongo/db/catalog/collection.h"
@@ -47,7 +46,7 @@
namespace QueryStageCountScan {
- using boost::shared_ptr;
+ using std::shared_ptr;
class CountBase {
public:
diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp
index d03a619a9b2..407c6f5bb89 100644
--- a/src/mongo/dbtests/query_stage_fetch.cpp
+++ b/src/mongo/dbtests/query_stage_fetch.cpp
@@ -30,7 +30,6 @@
* 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/catalog/collection.h"
@@ -47,7 +46,7 @@
namespace QueryStageFetch {
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::unique_ptr;
using std::set;
diff --git a/src/mongo/dbtests/query_stage_keep.cpp b/src/mongo/dbtests/query_stage_keep.cpp
index 00de94c770d..3d5b7d649c4 100644
--- a/src/mongo/dbtests/query_stage_keep.cpp
+++ b/src/mongo/dbtests/query_stage_keep.cpp
@@ -30,7 +30,6 @@
* This file tests db/exec/keep_mutations.cpp.
*/
-#include <boost/shared_ptr.hpp>
#include "mongo/client/dbclientcursor.h"
#include "mongo/db/catalog/collection.h"
@@ -52,7 +51,7 @@
namespace QueryStageKeep {
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::set;
class QueryStageKeepBase {
diff --git a/src/mongo/dbtests/query_stage_near.cpp b/src/mongo/dbtests/query_stage_near.cpp
index 2f2d8316fea..2ce80d94a7b 100644
--- a/src/mongo/dbtests/query_stage_near.cpp
+++ b/src/mongo/dbtests/query_stage_near.cpp
@@ -30,7 +30,6 @@
* This file tests near search functionality.
*/
-#include <boost/shared_ptr.hpp>
#include "mongo/base/owned_pointer_vector.h"
#include "mongo/db/exec/near.h"
@@ -40,7 +39,7 @@
namespace {
using namespace mongo;
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::vector;
/**
diff --git a/src/mongo/dbtests/sharding.cpp b/src/mongo/dbtests/sharding.cpp
index 9bc6068c9fb..70413b3ad34 100644
--- a/src/mongo/dbtests/sharding.cpp
+++ b/src/mongo/dbtests/sharding.cpp
@@ -30,7 +30,6 @@
#include "mongo/platform/basic.h"
-#include <boost/shared_ptr.hpp>
#include "mongo/client/parallel.h"
#include "mongo/db/dbdirectclient.h"
@@ -47,7 +46,7 @@
namespace ShardingTests {
- using boost::shared_ptr;
+ using std::shared_ptr;
using std::unique_ptr;
using std::make_pair;
using std::map;
@@ -478,7 +477,7 @@ namespace ShardingTests {
VersionMap maxShardVersions;
// Create a differ which will track our progress
- boost::shared_ptr< DefaultDiffAdapter > differ( _inverse ? new InverseDiffAdapter() : new DefaultDiffAdapter() );
+ std::shared_ptr< DefaultDiffAdapter > differ( _inverse ? new InverseDiffAdapter() : new DefaultDiffAdapter() );
differ->attach( "test", ranges, maxVersion, maxShardVersions );
std::vector<ChunkType> chunksVector;
View Lorry Controller Status