diff options
author | grickevich <grickevich@yandex-team.ru> | 2022-02-10 16:48:59 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:59 +0300 |
commit | b269ec1b854e2a830dbde2b5328a262a6a249b98 (patch) | |
tree | 5141ed0e2f98e033ea19987d51a7ae7429dc2fdd | |
parent | 2704bb412325db71fb2c5b3ffb25ce693c1d1298 (diff) | |
download | ydb-b269ec1b854e2a830dbde2b5328a262a6a249b98.tar.gz |
Restoring authorship annotation for <grickevich@yandex-team.ru>. Commit 1 of 2.
-rw-r--r-- | contrib/python/ya.make | 2 | ||||
-rw-r--r-- | library/cpp/balloc/balloc.cpp | 24 | ||||
-rw-r--r-- | library/cpp/binsaver/bin_saver.h | 2 | ||||
-rw-r--r-- | util/generic/maybe_ut.cpp | 90 | ||||
-rw-r--r-- | util/generic/string.h | 4 | ||||
-rw-r--r-- | util/generic/string_ut.h | 2 |
6 files changed, 62 insertions, 62 deletions
diff --git a/contrib/python/ya.make b/contrib/python/ya.make index d01ced9f3a..3d038f65df 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -1177,7 +1177,7 @@ RECURSE( yfinance youtube-dl yoyo-migrations - yt-dlp + yt-dlp zake zeep zero-downtime-migrations diff --git a/library/cpp/balloc/balloc.cpp b/library/cpp/balloc/balloc.cpp index fab489db4c..677527c427 100644 --- a/library/cpp/balloc/balloc.cpp +++ b/library/cpp/balloc/balloc.cpp @@ -285,24 +285,24 @@ extern "C" bool BallocDisabled() { extern "C" void DisableBalloc() { NBalloc::Disable(); } - + extern "C" void EnableBalloc() { NBalloc::Enable(); } -extern "C" void* memalign(size_t alignment, size_t size) { - void* ptr; - int res = posix_memalign(&ptr, alignment, size); - return res ? nullptr : ptr; -} - +extern "C" void* memalign(size_t alignment, size_t size) { + void* ptr; + int res = posix_memalign(&ptr, alignment, size); + return res ? nullptr : ptr; +} + extern "C" void* valloc(size_t size) { return memalign(NBalloc::PAGE_ELEM, size); } #if !defined(_MSC_VER) && !defined(_freebsd_) -// Workaround for pthread_create bug in linux. -extern "C" void* __libc_memalign(size_t alignment, size_t size) { - return memalign(alignment, size); -} -#endif +// Workaround for pthread_create bug in linux. +extern "C" void* __libc_memalign(size_t alignment, size_t size) { + return memalign(alignment, size); +} +#endif diff --git a/library/cpp/binsaver/bin_saver.h b/library/cpp/binsaver/bin_saver.h index 412424889f..39880bd7e9 100644 --- a/library/cpp/binsaver/bin_saver.h +++ b/library/cpp/binsaver/bin_saver.h @@ -508,7 +508,7 @@ public: int Add(const chunk_id, TMaybe<T, TPolicy>* pData) { TMaybe<T, TPolicy>& data = *pData; if (IsReading()) { - bool defined = false; + bool defined = false; Add(1, &defined); if (defined) { data = T(); diff --git a/util/generic/maybe_ut.cpp b/util/generic/maybe_ut.cpp index 2c1a425c5e..792d806354 100644 --- a/util/generic/maybe_ut.cpp +++ b/util/generic/maybe_ut.cpp @@ -156,58 +156,58 @@ Y_UNIT_TEST_SUITE(TMaybeTest) { x = 7; UNIT_ASSERT(m == 7); } - + Y_UNIT_TEST(TestMove) { - struct TMovable { - int Flag = 0; - - TMovable(int flag) - : Flag(flag) - { - } - - TMovable(const TMovable&) = delete; - TMovable& operator=(const TMovable&) = delete; - - TMovable(TMovable&& other) { - std::swap(Flag, other.Flag); - } - TMovable& operator=(TMovable&& other) { - std::swap(Flag, other.Flag); - return *this; - } - }; - - // Move ctor from value - TMovable value1(1); - TMaybe<TMovable> m1(std::move(value1)); - UNIT_ASSERT(m1.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m1->Flag, 1); - - // Move assignment from value - TMovable value2(2); - TMaybe<TMovable> m2; - m2 = std::move(value2); - UNIT_ASSERT(m2.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m2->Flag, 2); - - // Move ctor from maybe - TMaybe<TMovable> m3(std::move(m1)); - UNIT_ASSERT(m3.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m3->Flag, 1); - - // Move assignment from maybe - TMaybe<TMovable> m4; - m4 = std::move(m2); - UNIT_ASSERT(m4.Defined()); - UNIT_ASSERT_VALUES_EQUAL(m4->Flag, 2); + struct TMovable { + int Flag = 0; + + TMovable(int flag) + : Flag(flag) + { + } + + TMovable(const TMovable&) = delete; + TMovable& operator=(const TMovable&) = delete; + + TMovable(TMovable&& other) { + std::swap(Flag, other.Flag); + } + TMovable& operator=(TMovable&& other) { + std::swap(Flag, other.Flag); + return *this; + } + }; + + // Move ctor from value + TMovable value1(1); + TMaybe<TMovable> m1(std::move(value1)); + UNIT_ASSERT(m1.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m1->Flag, 1); + + // Move assignment from value + TMovable value2(2); + TMaybe<TMovable> m2; + m2 = std::move(value2); + UNIT_ASSERT(m2.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m2->Flag, 2); + + // Move ctor from maybe + TMaybe<TMovable> m3(std::move(m1)); + UNIT_ASSERT(m3.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m3->Flag, 1); + + // Move assignment from maybe + TMaybe<TMovable> m4; + m4 = std::move(m2); + UNIT_ASSERT(m4.Defined()); + UNIT_ASSERT_VALUES_EQUAL(m4->Flag, 2); // Move value from temporary maybe instance TMovable o5 = *MakeMaybe<TMovable>(5); UNIT_ASSERT_VALUES_EQUAL(o5.Flag, 5); TMovable o6 = MakeMaybe<TMovable>(6).GetRef(); UNIT_ASSERT_VALUES_EQUAL(o6.Flag, 6); - } + } Y_UNIT_TEST(TestCast) { // Undefined maybe casts to undefined maybe diff --git a/util/generic/string.h b/util/generic/string.h index 8cd8aa6917..ff239bc09b 100644 --- a/util/generic/string.h +++ b/util/generic/string.h @@ -551,8 +551,8 @@ private: CopyAll(p + s.size(), r...); } - template <typename... R, class TNextCharType, typename = std::enable_if_t<std::is_same<TCharType, TNextCharType>::value>> - static void CopyAll(TCharType* p, const TNextCharType s, const R&... r) { + template <typename... R, class TNextCharType, typename = std::enable_if_t<std::is_same<TCharType, TNextCharType>::value>> + static void CopyAll(TCharType* p, const TNextCharType s, const R&... r) { p[0] = s; CopyAll(p + 1, r...); } diff --git a/util/generic/string_ut.h b/util/generic/string_ut.h index 44bb10bdeb..b0151a1d68 100644 --- a/util/generic/string_ut.h +++ b/util/generic/string_ut.h @@ -938,7 +938,7 @@ public: UNIT_ASSERT_EQUAL(TStringType::Join(Data._12(), TStringType(Data._345()), Data._6()), Data._123456()); UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data._12()), TStringType(Data._345()), Data._6()), Data._123456()); UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), Data.b(), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); - UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), static_cast<typename TStringType::char_type>('b'), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); + UNIT_ASSERT_EQUAL(TStringType::Join(TStringType(Data.a()), static_cast<typename TStringType::char_type>('b'), TStringType(Data.cd()), TStringType(Data.e()), Data.fg(), TStringType(Data.h())), Data.abcdefgh()); } void TestCopy() { |