summaryrefslogtreecommitdiff
path: root/src/mongo/scripting
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:18:23 -0400
committerADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:18:23 -0400
commitc9548e729c8fecd9d7a9a5dd341da0433194ac73 (patch)
tree37b05114182d8a7787c0b39aa71b0ec381292e85 /src/mongo/scripting
parentc43636652fc4fb69a47f4eaaa767bc57bb59bb5f (diff)
downloadmongo-c9548e729c8fecd9d7a9a5dd341da0433194ac73.tar.gz
SERVER-39338 Remove `stdx/functional.h`
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r--src/mongo/scripting/bson_template_evaluator.h10
-rw-r--r--src/mongo/scripting/dbdirectclient_factory.h5
2 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/scripting/bson_template_evaluator.h b/src/mongo/scripting/bson_template_evaluator.h
index 6d2f0565790..90fb9fe5b6f 100644
--- a/src/mongo/scripting/bson_template_evaluator.h
+++ b/src/mongo/scripting/bson_template_evaluator.h
@@ -44,12 +44,12 @@
*/
#pragma once
+#include <functional>
#include <map>
#include <string>
#include "mongo/db/jsobj.h"
#include "mongo/platform/random.h"
-#include "mongo/stdx/functional.h"
namespace mongo {
@@ -93,10 +93,10 @@ public:
* fieldName : key
* in : { #RAND_INT: [10, 20] }
*/
- typedef stdx::function<Status(BsonTemplateEvaluator* btl,
- const char* fieldName,
- const BSONObj& in,
- BSONObjBuilder& builder)>
+ typedef std::function<Status(BsonTemplateEvaluator* btl,
+ const char* fieldName,
+ const BSONObj& in,
+ BSONObjBuilder& builder)>
OperatorFn;
/*
diff --git a/src/mongo/scripting/dbdirectclient_factory.h b/src/mongo/scripting/dbdirectclient_factory.h
index 49e71c6b7ab..eed8ec5dcf5 100644
--- a/src/mongo/scripting/dbdirectclient_factory.h
+++ b/src/mongo/scripting/dbdirectclient_factory.h
@@ -29,10 +29,9 @@
#pragma once
+#include <functional>
#include <memory>
-#include "mongo/stdx/functional.h"
-
namespace mongo {
class DBClientBase;
@@ -42,7 +41,7 @@ class ServiceContext;
class DBDirectClientFactory {
public:
using Result = std::unique_ptr<DBClientBase>;
- using Impl = stdx::function<Result(OperationContext*)>;
+ using Impl = std::function<Result(OperationContext*)>;
static DBDirectClientFactory& get(ServiceContext* service);
static DBDirectClientFactory& get(OperationContext* opCtx);