diff options
| author | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:21:01 -0400 |
|---|---|---|
| committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:59:35 -0400 |
| commit | c36f9ecb91e49da7e637863889804fc4e6c6c05e (patch) | |
| tree | 64d8aadb6d29042d4f4e7366bc1457e4e0612383 /src/mongo/db/matcher/expression_leaf.cpp | |
| parent | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff) | |
| download | mongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz | |
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/db/matcher/expression_leaf.cpp')
| -rw-r--r-- | src/mongo/db/matcher/expression_leaf.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp index 334dd0201e7..ee43237617e 100644 --- a/src/mongo/db/matcher/expression_leaf.cpp +++ b/src/mongo/db/matcher/expression_leaf.cpp @@ -32,6 +32,7 @@ #include "mongo/db/matcher/expression_leaf.h" #include <cmath> +#include <memory> #include <pcrecpp.h> #include "mongo/bson/bsonelement_comparator.h" @@ -43,7 +44,6 @@ #include "mongo/db/matcher/expression_parser.h" #include "mongo/db/matcher/path.h" #include "mongo/db/query/collation/collator_interface.h" -#include "mongo/stdx/memory.h" #include "mongo/util/regex_util.h" #include "mongo/util/str.h" @@ -367,7 +367,7 @@ InMatchExpression::InMatchExpression(StringData path) _eltCmp(BSONElementComparator::FieldNamesMode::kIgnore, _collator) {} std::unique_ptr<MatchExpression> InMatchExpression::shallowClone() const { - auto next = stdx::make_unique<InMatchExpression>(path()); + auto next = std::make_unique<InMatchExpression>(path()); next->setCollator(_collator); if (getTag()) { next->setTag(getTag()->clone()); @@ -551,7 +551,7 @@ MatchExpression::ExpressionOptimizerFunc InMatchExpression::getOptimizer() const auto& childRe = regexList.front(); invariant(!childRe->getTag()); - auto simplifiedExpression = stdx::make_unique<RegexMatchExpression>( + auto simplifiedExpression = std::make_unique<RegexMatchExpression>( expression->path(), childRe->getString(), childRe->getFlags()); if (expression->getTag()) { simplifiedExpression->setTag(expression->getTag()->clone()); @@ -559,7 +559,7 @@ MatchExpression::ExpressionOptimizerFunc InMatchExpression::getOptimizer() const return std::move(simplifiedExpression); } else if (equalitySet.size() == 1 && regexList.empty()) { // Simplify IN of exactly one equality to be an EqualityMatchExpression. - auto simplifiedExpression = stdx::make_unique<EqualityMatchExpression>( + auto simplifiedExpression = std::make_unique<EqualityMatchExpression>( expression->path(), *(equalitySet.begin())); simplifiedExpression->setCollator(collator); if (expression->getTag()) { |