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/sorter | |
| 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/sorter')
| -rw-r--r-- | src/mongo/db/sorter/sorter.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/db/sorter/sorter_test.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/db/sorter/sorter.cpp b/src/mongo/db/sorter/sorter.cpp index 7eedd1ce35a..4efa4a79840 100644 --- a/src/mongo/db/sorter/sorter.cpp +++ b/src/mongo/db/sorter/sorter.cpp @@ -64,7 +64,7 @@ #include "mongo/util/assert_util.h" #include "mongo/util/bufreader.h" #include "mongo/util/destructor_guard.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" #include "mongo/util/unowned_ptr.h" namespace mongo { @@ -72,7 +72,6 @@ namespace mongo { namespace sorter { using std::shared_ptr; -using namespace mongoutils; // We need to use the "real" errno everywhere, not GetLastError() on Windows inline std::string myErrnoWithDescription() { @@ -904,7 +903,6 @@ SortedFileWriter<Key, Value>::SortedFileWriter(const SortOptions& opts, const std::streampos fileStartOffset, const Settings& settings) : _settings(settings) { - namespace str = mongoutils::str; // This should be checked by consumers, but if we get here don't allow writes. uassert( @@ -946,8 +944,6 @@ void SortedFileWriter<Key, Value>::addAlreadySorted(const Key& key, const Value& template <typename Key, typename Value> void SortedFileWriter<Key, Value>::spill() { - namespace str = mongoutils::str; - int32_t size = _buffer.len(); char* outBuffer = _buffer.buf(); diff --git a/src/mongo/db/sorter/sorter_test.cpp b/src/mongo/db/sorter/sorter_test.cpp index 61af0e368e9..18fcf91f0b1 100644 --- a/src/mongo/db/sorter/sorter_test.cpp +++ b/src/mongo/db/sorter/sorter_test.cpp @@ -42,7 +42,7 @@ #include "mongo/stdx/thread.h" #include "mongo/unittest/temp_dir.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/mongoutils/str.h" +#include "mongo/util/str.h" #include <memory> |