diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-08 16:27:50 -0400 |
|---|---|---|
| committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-04-09 15:38:40 -0400 |
| commit | 1041dd848e25e879260d1015d8da4f72ee7993fe (patch) | |
| tree | f8ddb4ee7c841e4ef790ea7bd53e75c0a09c4cc2 /src/mongo/db/ops | |
| parent | 8cdc51e7810f7fd8898a4c60b935e389f04659ee (diff) | |
| download | mongo-1041dd848e25e879260d1015d8da4f72ee7993fe.tar.gz | |
SERVER-40476 remove mongoutils::str
Rename utils/mongoutils/str.h => utils/str.h
Rename namespace mongoutils::str => str
Rename mongo::strcasecmp => str::caseInsensitiveCompare.
Diffstat (limited to 'src/mongo/db/ops')
| -rw-r--r-- | src/mongo/db/ops/insert.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/ops/parsed_delete.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/ops/update_request.h | 4 | ||||
| -rw-r--r-- | src/mongo/db/ops/update_result.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/ops/write_ops_parsers.cpp | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/src/mongo/db/ops/insert.cpp b/src/mongo/db/ops/insert.cpp index cb056f6fc33..d891c998a7c 100644 --- a/src/mongo/db/ops/insert.cpp +++ b/src/mongo/db/ops/insert.cpp @@ -36,14 +36,12 @@ #include "mongo/db/logical_clock.h" #include "mongo/db/logical_time.h" #include "mongo/db/views/durable_view_catalog.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { using std::string; -using namespace mongoutils; - namespace { /** * Validates the nesting depth of 'obj', returning a non-OK status if it exceeds the limit. diff --git a/src/mongo/db/ops/parsed_delete.cpp b/src/mongo/db/ops/parsed_delete.cpp index 3221b340d5b..ad6ec0c25e0 100644 --- a/src/mongo/db/ops/parsed_delete.cpp +++ b/src/mongo/db/ops/parsed_delete.cpp @@ -43,7 +43,7 @@ #include "mongo/db/query/query_planner_common.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/ops/update_request.h b/src/mongo/db/ops/update_request.h index c47dbe113e6..00249500343 100644 --- a/src/mongo/db/ops/update_request.h +++ b/src/mongo/db/ops/update_request.h @@ -34,12 +34,10 @@ #include "mongo/db/logical_session_id.h" #include "mongo/db/namespace_string.h" #include "mongo/db/query/explain.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { -namespace str = mongoutils::str; - class FieldRef; class UpdateRequest { diff --git a/src/mongo/db/ops/update_result.cpp b/src/mongo/db/ops/update_result.cpp index d63d806f17f..8765dd1dde1 100644 --- a/src/mongo/db/ops/update_result.cpp +++ b/src/mongo/db/ops/update_result.cpp @@ -36,7 +36,7 @@ #include "mongo/db/lasterror.h" #include "mongo/util/log.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/ops/write_ops_parsers.cpp b/src/mongo/db/ops/write_ops_parsers.cpp index bfc99fef55c..7d6a03ec977 100644 --- a/src/mongo/db/ops/write_ops_parsers.cpp +++ b/src/mongo/db/ops/write_ops_parsers.cpp @@ -34,7 +34,7 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/ops/write_ops.h" #include "mongo/util/assert_util.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" namespace mongo { |