aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgolear <dgolear@yandex-team.com>2024-12-09 13:34:13 +0300
committerdgolear <dgolear@yandex-team.com>2024-12-09 13:55:35 +0300
commitd4510c40056498c21c4185bc678c4eed3ab89cea (patch)
tree0128f726ffcdea16c5730880701ba704def977c8
parentb3a63b7a0ae40f6e467a63edbd0602c505dc7f69 (diff)
downloadydb-d4510c40056498c21c4185bc678c4eed3ab89cea.tar.gz
Remove std::nullptr_t ctor for TString
commit_hash:6b02e6cb83bde366477f7d53b6cd6c00bffdb4d6
-rw-r--r--util/generic/strbuf.h2
-rw-r--r--util/generic/string.h3
-rw-r--r--util/generic/string_ut.h6
3 files changed, 4 insertions, 7 deletions
diff --git a/util/generic/strbuf.h b/util/generic/strbuf.h
index 6806950dc3..06e27550e6 100644
--- a/util/generic/strbuf.h
+++ b/util/generic/strbuf.h
@@ -98,6 +98,8 @@ public:
* to generate compilation error instead.
*/
constexpr inline TBasicStringBuf(std::nullptr_t begin, size_t size) = delete;
+ // TODO: Uncomment.
+ // constexpr TBasicStringBuf(std::nullptr_t) = delete;
constexpr inline TBasicStringBuf(const TCharType* data Y_LIFETIME_BOUND, size_t size) noexcept
: TStringView(data, size)
diff --git a/util/generic/string.h b/util/generic/string.h
index fa7d055adc..2d11252240 100644
--- a/util/generic/string.h
+++ b/util/generic/string.h
@@ -463,8 +463,7 @@ public:
: TBasicString(pc, TBase::StrLen(pc))
{
}
- // TODO thegeorg@: uncomment and fix clients
- // TBasicString(std::nullptr_t) = delete;
+ TBasicString(std::nullptr_t) = delete;
TBasicString(const TCharType* pc, size_t n)
#ifdef TSTRING_IS_STD_STRING
diff --git a/util/generic/string_ut.h b/util/generic/string_ut.h
index d72c2bd7ee..bb91e07a21 100644
--- a/util/generic/string_ut.h
+++ b/util/generic/string_ut.h
@@ -525,18 +525,14 @@ public:
}
void TestConstructors() {
- TStringType s0(nullptr);
+ TStringType s0;
UNIT_ASSERT(s0.size() == 0);
- UNIT_ASSERT_EQUAL(s0, TStringType());
TStringType s;
TStringType s1(*Data._0());
TStringType s2(Data._0());
UNIT_ASSERT(s1 == s2);
- TStringType fromZero(0);
- UNIT_ASSERT_VALUES_EQUAL(fromZero.size(), 0u);
-
TStringType fromChar(char_type('a'));
UNIT_ASSERT_VALUES_EQUAL(fromChar.size(), 1u);
UNIT_ASSERT_VALUES_EQUAL(fromChar[0], char_type('a'));