diff options
Diffstat (limited to 'src/mongo/bson/util')
| -rw-r--r-- | src/mongo/bson/util/bson_extract.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/bson/util/bson_extract.h | 6 | ||||
| -rw-r--r-- | src/mongo/bson/util/bson_extract_test.cpp | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/bson/util/bson_extract.cpp b/src/mongo/bson/util/bson_extract.cpp index 481c26df5fe..acd52ce7d82 100644 --- a/src/mongo/bson/util/bson_extract.cpp +++ b/src/mongo/bson/util/bson_extract.cpp @@ -251,7 +251,7 @@ Status bsonExtractIntegerFieldWithDefault(const BSONObj& object, Status bsonExtractIntegerFieldWithDefaultIf(const BSONObj& object, StringData fieldName, long long defaultValue, - stdx::function<bool(long long)> pred, + std::function<bool(long long)> pred, const std::string& predDescription, long long* out) { Status status = bsonExtractIntegerFieldWithDefault(object, fieldName, defaultValue, out); @@ -270,7 +270,7 @@ Status bsonExtractIntegerFieldWithDefaultIf(const BSONObj& object, Status bsonExtractIntegerFieldWithDefaultIf(const BSONObj& object, StringData fieldName, long long defaultValue, - stdx::function<bool(long long)> pred, + std::function<bool(long long)> pred, long long* out) { return bsonExtractIntegerFieldWithDefaultIf( object, fieldName, defaultValue, pred, "constraint failed", out); diff --git a/src/mongo/bson/util/bson_extract.h b/src/mongo/bson/util/bson_extract.h index 4dad3473377..8be7e0393ed 100644 --- a/src/mongo/bson/util/bson_extract.h +++ b/src/mongo/bson/util/bson_extract.h @@ -29,13 +29,13 @@ #pragma once +#include <functional> #include <string> #include <vector> #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsontypes.h" -#include "mongo/stdx/functional.h" namespace mongo { @@ -216,14 +216,14 @@ Status bsonExtractOIDFieldWithDefault(const BSONObj& object, Status bsonExtractIntegerFieldWithDefaultIf(const BSONObj& object, StringData fieldName, long long defaultValue, - stdx::function<bool(long long)> pred, + std::function<bool(long long)> pred, const std::string& predDescription, long long* out); Status bsonExtractIntegerFieldWithDefaultIf(const BSONObj& object, StringData fieldName, long long defaultValue, - stdx::function<bool(long long)> pred, + std::function<bool(long long)> pred, long long* out); } // namespace mongo diff --git a/src/mongo/bson/util/bson_extract_test.cpp b/src/mongo/bson/util/bson_extract_test.cpp index c8d90a59d3c..dbb76f1a9c7 100644 --- a/src/mongo/bson/util/bson_extract_test.cpp +++ b/src/mongo/bson/util/bson_extract_test.cpp @@ -34,7 +34,6 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/db/jsobj.h" #include "mongo/db/repl/optime.h" -#include "mongo/stdx/functional.h" #include "mongo/unittest/unittest.h" using namespace mongo; |