summaryrefslogtreecommitdiff
path: root/src/mongo/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/base')
-rw-r--r--src/mongo/base/data_range.cpp2
-rw-r--r--src/mongo/base/data_range.h2
-rw-r--r--src/mongo/base/data_range_cursor.cpp6
-rw-r--r--src/mongo/base/data_range_cursor.h2
-rw-r--r--src/mongo/base/data_type.cpp6
-rw-r--r--src/mongo/base/data_type_string_data.cpp2
-rw-r--r--src/mongo/base/data_type_terminated.cpp2
-rw-r--r--src/mongo/base/error_codes.tpl.cpp4
-rw-r--r--src/mongo/base/parse_number_test.cpp7
-rw-r--r--src/mongo/base/status.cpp4
-rw-r--r--src/mongo/base/status.h9
-rw-r--r--src/mongo/base/status_with.h3
-rw-r--r--src/mongo/base/validate_locale.cpp2
13 files changed, 23 insertions, 28 deletions
diff --git a/src/mongo/base/data_range.cpp b/src/mongo/base/data_range.cpp
index 38704a9bbae..c17dbdfff93 100644
--- a/src/mongo/base/data_range.cpp
+++ b/src/mongo/base/data_range.cpp
@@ -29,7 +29,7 @@
#include "mongo/base/data_range.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/base/data_range.h b/src/mongo/base/data_range.h
index eb53af9719a..75acf53ec0f 100644
--- a/src/mongo/base/data_range.h
+++ b/src/mongo/base/data_range.h
@@ -37,7 +37,7 @@
#include "mongo/base/error_codes.h"
#include "mongo/base/status_with.h"
#include "mongo/platform/endian.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
class ConstDataRange {
diff --git a/src/mongo/base/data_range_cursor.cpp b/src/mongo/base/data_range_cursor.cpp
index c7626ada66a..b22ee726e2a 100644
--- a/src/mongo/base/data_range_cursor.cpp
+++ b/src/mongo/base/data_range_cursor.cpp
@@ -29,12 +29,12 @@
#include "mongo/base/data_range_cursor.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
Status ConstDataRangeCursor::makeAdvanceStatus(size_t advance) const {
- mongoutils::str::stream ss;
+ str::stream ss;
ss << "Invalid advance (" << advance << ") past end of buffer[" << length()
<< "] at offset: " << _debug_offset;
@@ -42,7 +42,7 @@ Status ConstDataRangeCursor::makeAdvanceStatus(size_t advance) const {
}
Status DataRangeCursor::makeAdvanceStatus(size_t advance) const {
- mongoutils::str::stream ss;
+ str::stream ss;
ss << "Invalid advance (" << advance << ") past end of buffer[" << length()
<< "] at offset: " << _debug_offset;
diff --git a/src/mongo/base/data_range_cursor.h b/src/mongo/base/data_range_cursor.h
index 13f0fdae4d3..89dff93eb43 100644
--- a/src/mongo/base/data_range_cursor.h
+++ b/src/mongo/base/data_range_cursor.h
@@ -36,7 +36,7 @@
#include "mongo/base/data_range.h"
#include "mongo/base/data_type.h"
#include "mongo/platform/endian.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/base/data_type.cpp b/src/mongo/base/data_type.cpp
index da0608eb2e7..6c2d5444b08 100644
--- a/src/mongo/base/data_type.cpp
+++ b/src/mongo/base/data_type.cpp
@@ -29,19 +29,19 @@
#include "mongo/base/data_type.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
Status DataType::makeTrivialLoadStatus(size_t sizeOfT, size_t length, size_t debug_offset) {
- mongoutils::str::stream ss;
+ str::stream ss;
ss << "buffer size too small to read (" << sizeOfT << ") bytes out of buffer[" << length
<< "] at offset: " << debug_offset;
return Status(ErrorCodes::Overflow, ss);
}
Status DataType::makeTrivialStoreStatus(size_t sizeOfT, size_t length, size_t debug_offset) {
- mongoutils::str::stream ss;
+ str::stream ss;
ss << "buffer size too small to write (" << sizeOfT << ") bytes into buffer[" << length
<< "] at offset: " << debug_offset;
return Status(ErrorCodes::Overflow, ss);
diff --git a/src/mongo/base/data_type_string_data.cpp b/src/mongo/base/data_type_string_data.cpp
index eb6198b609a..51929f718a5 100644
--- a/src/mongo/base/data_type_string_data.cpp
+++ b/src/mongo/base/data_type_string_data.cpp
@@ -29,7 +29,7 @@
#include "mongo/base/data_type.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
diff --git a/src/mongo/base/data_type_terminated.cpp b/src/mongo/base/data_type_terminated.cpp
index 20ea8472167..5074abbe22f 100644
--- a/src/mongo/base/data_type_terminated.cpp
+++ b/src/mongo/base/data_type_terminated.cpp
@@ -29,7 +29,7 @@
#include "mongo/base/data_type_terminated.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
#include "mongo/util/stringutils.h"
namespace mongo {
diff --git a/src/mongo/base/error_codes.tpl.cpp b/src/mongo/base/error_codes.tpl.cpp
index d4eaffce1c9..9242c885629 100644
--- a/src/mongo/base/error_codes.tpl.cpp
+++ b/src/mongo/base/error_codes.tpl.cpp
@@ -33,7 +33,7 @@
#include "mongo/base/static_assert.h"
#include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
//#set $codes_with_extra = [ec for ec in $codes if ec.extra]
@@ -58,7 +58,7 @@ std::string ErrorCodes::errorString(Error err) {
return "$ec.name";
//#end for
default:
- return mongoutils::str::stream() << "Location" << int(err);
+ return str::stream() << "Location" << int(err);
}
}
diff --git a/src/mongo/base/parse_number_test.cpp b/src/mongo/base/parse_number_test.cpp
index d2d96934988..b17968f4081 100644
--- a/src/mongo/base/parse_number_test.cpp
+++ b/src/mongo/base/parse_number_test.cpp
@@ -36,7 +36,7 @@
#include "mongo/base/parse_number.h"
#include "mongo/base/status.h"
#include "mongo/unittest/unittest.h"
-#include "mongo/util/mongoutils/str.h" // for str::stream()!
+#include "mongo/util/str.h" // for str::stream()!
#define ASSERT_PARSES(TYPE, INPUT_STRING, EXPECTED_VALUE) \
do { \
@@ -147,7 +147,6 @@ public:
}
static void TestParsingLimits() {
- using namespace mongoutils;
NumberType ignored;
ASSERT_PARSES(NumberType, std::string(str::stream() << Limits::max()), Limits::max());
ASSERT_PARSES(NumberType, std::string(str::stream() << Limits::min()), Limits::min());
@@ -226,7 +225,7 @@ TEST(ParseNumber, Int8) {
ASSERT_EQUALS(ErrorCodes::FailedToParse, parseNumberFromString("900", &ignored));
for (int32_t i = -128; i <= 127; ++i)
- ASSERT_PARSES(int8_t, std::string(mongoutils::str::stream() << i), i);
+ ASSERT_PARSES(int8_t, std::string(str::stream() << i), i);
}
TEST(ParseNumber, UInt8) {
@@ -238,7 +237,7 @@ TEST(ParseNumber, UInt8) {
ASSERT_EQUALS(ErrorCodes::FailedToParse, parseNumberFromString("+900", &ignored));
for (uint32_t i = 0; i <= 255; ++i)
- ASSERT_PARSES(uint8_t, std::string(mongoutils::str::stream() << i), i);
+ ASSERT_PARSES(uint8_t, std::string(str::stream() << i), i);
}
TEST(ParseNumber, TestParsingOverflow) {
diff --git a/src/mongo/base/status.cpp b/src/mongo/base/status.cpp
index a97885a55b0..696ff79e5e0 100644
--- a/src/mongo/base/status.cpp
+++ b/src/mongo/base/status.cpp
@@ -32,7 +32,7 @@
#include "mongo/base/status.h"
#include "mongo/db/jsobj.h"
#include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
#include <ostream>
#include <sstream>
@@ -97,7 +97,7 @@ Status::Status(ErrorCodes::Error code, StringData reason, const BSONObj& extraIn
}
}
-Status::Status(ErrorCodes::Error code, const mongoutils::str::stream& reason)
+Status::Status(ErrorCodes::Error code, const str::stream& reason)
: Status(code, std::string(reason)) {}
Status Status::withReason(StringData newReason) const {
diff --git a/src/mongo/base/status.h b/src/mongo/base/status.h
index 21b9eadf268..61a155e98cf 100644
--- a/src/mongo/base/status.h
+++ b/src/mongo/base/status.h
@@ -37,13 +37,11 @@
#include "mongo/platform/atomic_word.h"
#include "mongo/platform/compiler.h"
-namespace mongoutils {
+namespace mongo {
+
namespace str {
class stream;
} // namespace str
-} // namespace mongoutils
-
-namespace mongo {
// Including builder.h here would cause a cycle.
template <typename Allocator>
@@ -80,8 +78,7 @@ public:
MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code, const std::string& reason);
MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code, const char* reason);
MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code, StringData reason);
- MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code,
- const mongoutils::str::stream& reason);
+ MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code, const str::stream& reason);
MONGO_COMPILER_COLD_FUNCTION Status(ErrorCodes::Error code,
StringData message,
const BSONObj& extraInfoHolder);
diff --git a/src/mongo/base/status_with.h b/src/mongo/base/status_with.h
index 4284a1ab530..453cfb08101 100644
--- a/src/mongo/base/status_with.h
+++ b/src/mongo/base/status_with.h
@@ -114,8 +114,7 @@ public:
: _status(code, std::move(reason)) {}
MONGO_COMPILER_COLD_FUNCTION StatusWith(ErrorCodes::Error code, const char* reason)
: _status(code, reason) {}
- MONGO_COMPILER_COLD_FUNCTION StatusWith(ErrorCodes::Error code,
- const mongoutils::str::stream& reason)
+ MONGO_COMPILER_COLD_FUNCTION StatusWith(ErrorCodes::Error code, const str::stream& reason)
: _status(code, reason) {}
/**
diff --git a/src/mongo/base/validate_locale.cpp b/src/mongo/base/validate_locale.cpp
index 76b9948f2a7..6159764ba7a 100644
--- a/src/mongo/base/validate_locale.cpp
+++ b/src/mongo/base/validate_locale.cpp
@@ -34,7 +34,7 @@
#include <locale>
#include "mongo/base/init.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
namespace mongo {
View Lorry Controller Status