diff options
author | spacelord <spacelord@yandex-team.ru> | 2022-02-10 16:48:15 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:15 +0300 |
commit | 16747e4f77455cca4932df21eb76f12cb0a97a5c (patch) | |
tree | 4dd6da4102d99d0d69dec53c1050d290a850a9f2 /library/cpp/containers | |
parent | a817f5de12611ec73085eba17f8ec7740a46bdb7 (diff) | |
download | ydb-16747e4f77455cca4932df21eb76f12cb0a97a5c.tar.gz |
Restoring authorship annotation for <spacelord@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/containers')
6 files changed, 56 insertions, 56 deletions
diff --git a/library/cpp/containers/atomizer/atomizer.h b/library/cpp/containers/atomizer/atomizer.h index 5e40f47ab9..164b018e2d 100644 --- a/library/cpp/containers/atomizer/atomizer.h +++ b/library/cpp/containers/atomizer/atomizer.h @@ -20,11 +20,11 @@ private: TVector<const char*> order; public: - using iterator = typename string_hash<ui32, HashFcn, EqualTo>::iterator; - using const_iterator = typename string_hash<ui32, HashFcn, EqualTo>::const_iterator; - using value_type = typename string_hash<ui32, HashFcn, EqualTo>::value_type; - using size_type = typename string_hash<ui32, HashFcn, EqualTo>::size_type; - using pool_size_type = typename string_hash<ui32, HashFcn, EqualTo>::pool_size_type; + using iterator = typename string_hash<ui32, HashFcn, EqualTo>::iterator; + using const_iterator = typename string_hash<ui32, HashFcn, EqualTo>::const_iterator; + using value_type = typename string_hash<ui32, HashFcn, EqualTo>::value_type; + using size_type = typename string_hash<ui32, HashFcn, EqualTo>::size_type; + using pool_size_type = typename string_hash<ui32, HashFcn, EqualTo>::pool_size_type; using string_hash<ui32, HashFcn, EqualTo>::pool; using string_hash<ui32, HashFcn, EqualTo>::size; @@ -112,15 +112,15 @@ private: TOrder order; public: - using iterator = typename string_hash<ui32, HashFcn, EqualTo>::iterator; - using const_iterator = typename string_hash<ui32, HashFcn, EqualTo>::const_iterator; - using value_type = typename string_hash<ui32, HashFcn, EqualTo>::value_type; - using size_type = typename string_hash<ui32, HashFcn, EqualTo>::size_type; - using pool_size_type = typename string_hash<ui32, HashFcn, EqualTo>::pool_size_type; - - using o_iterator = typename TOrder::iterator; - using o_const_iterator = typename TOrder::const_iterator; - using o_value_type = typename TOrder::value_type; + using iterator = typename string_hash<ui32, HashFcn, EqualTo>::iterator; + using const_iterator = typename string_hash<ui32, HashFcn, EqualTo>::const_iterator; + using value_type = typename string_hash<ui32, HashFcn, EqualTo>::value_type; + using size_type = typename string_hash<ui32, HashFcn, EqualTo>::size_type; + using pool_size_type = typename string_hash<ui32, HashFcn, EqualTo>::pool_size_type; + + using o_iterator = typename TOrder::iterator; + using o_const_iterator = typename TOrder::const_iterator; + using o_value_type = typename TOrder::value_type; using string_hash<ui32, HashFcn, EqualTo>::pool; using string_hash<ui32, HashFcn, EqualTo>::size; diff --git a/library/cpp/containers/intrusive_avl_tree/avltree.h b/library/cpp/containers/intrusive_avl_tree/avltree.h index a58c63b07c..a1af47c53a 100644 --- a/library/cpp/containers/intrusive_avl_tree/avltree.h +++ b/library/cpp/containers/intrusive_avl_tree/avltree.h @@ -7,7 +7,7 @@ struct TAvlTreeItem; template <class T, class C> class TAvlTree: public TNonCopyable { - using TTreeItem = TAvlTreeItem<T, C>; + using TTreeItem = TAvlTreeItem<T, C>; friend struct TAvlTreeItem<T, C>; static inline const T* AsT(const TTreeItem* item) noexcept { @@ -178,7 +178,7 @@ class TAvlTree: public TNonCopyable { public: using const_iterator = TConstIterator; - using iterator = TIterator; + using iterator = TIterator; inline TAvlTree() noexcept : Root_(nullptr) @@ -721,7 +721,7 @@ private: template <class T, class C> struct TAvlTreeItem: public TNonCopyable { public: - using TTree = TAvlTree<T, C>; + using TTree = TAvlTree<T, C>; friend class TAvlTree<T, C>; friend typename TAvlTree<T, C>::TConstIterator; friend typename TAvlTree<T, C>::TIterator; diff --git a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp index cab2365cce..87807f0492 100644 --- a/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp +++ b/library/cpp/containers/intrusive_avl_tree/ut/avltree_ut.cpp @@ -27,7 +27,7 @@ private: int Val; }; - using TIts = TAvlTree<TIt, TItCompare>; + using TIts = TAvlTree<TIt, TItCompare>; }; inline bool TAvlTreeTest::TItCompare::Compare(const TIt& l, const TIt& r) noexcept { diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree.h b/library/cpp/containers/intrusive_rb_tree/rb_tree.h index 0259452a14..5539d6391b 100644 --- a/library/cpp/containers/intrusive_rb_tree/rb_tree.h +++ b/library/cpp/containers/intrusive_rb_tree/rb_tree.h @@ -3,14 +3,14 @@ #include <util/generic/utility.h> #include <util/generic/yexception.h> -using TRbTreeColorType = bool; +using TRbTreeColorType = bool; #define RBTreeRed false #define RBTreeBlack true struct TRbTreeNodeBase { - using TColorType = TRbTreeColorType; - using TBasePtr = TRbTreeNodeBase*; + using TColorType = TRbTreeColorType; + using TBasePtr = TRbTreeNodeBase*; TColorType Color_; TBasePtr Parent_; @@ -63,7 +63,7 @@ struct TRbTreeBaseIterator; template <class TDummy> class TRbGlobal { public: - using TBasePtr = TRbTreeNodeBase*; + using TBasePtr = TRbTreeNodeBase*; static void Rebalance(TBasePtr x, TBasePtr& root); static TBasePtr RebalanceForErase(TBasePtr z, TBasePtr& root, TBasePtr& leftmost, TBasePtr& rightmost); @@ -76,10 +76,10 @@ public: static void RotateRight(TBasePtr x, TBasePtr& root); }; -using TRbGlobalInst = TRbGlobal<bool>; +using TRbGlobalInst = TRbGlobal<bool>; struct TRbTreeBaseIterator { - using TBasePtr = TRbTreeNodeBase*; + using TBasePtr = TRbTreeNodeBase*; TBasePtr Node_; inline TRbTreeBaseIterator(TBasePtr x = nullptr) noexcept @@ -90,10 +90,10 @@ struct TRbTreeBaseIterator { template <class TValue, class TTraits> struct TRbTreeIterator: public TRbTreeBaseIterator { - using TReference = typename TTraits::TReference; - using TPointer = typename TTraits::TPointer; - using TSelf = TRbTreeIterator<TValue, TTraits>; - using TBasePtr = TRbTreeNodeBase*; + using TReference = typename TTraits::TReference; + using TPointer = typename TTraits::TPointer; + using TSelf = TRbTreeIterator<TValue, TTraits>; + using TBasePtr = TRbTreeNodeBase*; inline TRbTreeIterator() noexcept = default; @@ -161,18 +161,18 @@ class TRbTree { }; struct TNonConstTraits { - using TReference = TValue&; - using TPointer = TValue*; + using TReference = TValue&; + using TPointer = TValue*; }; struct TConstTraits { - using TReference = const TValue&; - using TPointer = const TValue*; + using TReference = const TValue&; + using TPointer = const TValue*; }; - using TNodeBase = TRbTreeNodeBase; - using TBasePtr = TRbTreeNodeBase*; - using TColorType = TRbTreeColorType; + using TNodeBase = TRbTreeNodeBase; + using TBasePtr = TRbTreeNodeBase*; + using TColorType = TRbTreeColorType; public: class TRealNode: public TNodeBase { @@ -206,8 +206,8 @@ public: TRbTree* Tree_; }; - using TIterator = TRbTreeIterator<TValue, TNonConstTraits>; - using TConstIterator = TRbTreeIterator<TValue, TConstTraits>; + using TIterator = TRbTreeIterator<TValue, TNonConstTraits>; + using TConstIterator = TRbTreeIterator<TValue, TConstTraits>; inline TRbTree() noexcept { Init(); diff --git a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp index c34ed1fd9b..8eb7cad122 100644 --- a/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp +++ b/library/cpp/containers/intrusive_rb_tree/rb_tree_ut.cpp @@ -34,7 +34,7 @@ class TRedBlackTreeTest: public TTestBase { int N; }; - using TTree = TRbTree<TNode, TCmp>; + using TTree = TRbTree<TNode, TCmp>; UNIT_TEST_SUITE(TRedBlackTreeTest); UNIT_TEST(TestEmpty) diff --git a/library/cpp/containers/str_map/str_map.h b/library/cpp/containers/str_map/str_map.h index 31b00d1b99..b3479867dd 100644 --- a/library/cpp/containers/str_map/str_map.h +++ b/library/cpp/containers/str_map/str_map.h @@ -41,11 +41,11 @@ protected: public: using yh = THashMap<const char*, T, HashFcn, EqualTo, Alloc>; - using iterator = typename yh::iterator; - using const_iterator = typename yh::const_iterator; - using mapped_type = typename yh::mapped_type; - using size_type = typename yh::size_type; - using pool_size_type = typename yh::size_type; + using iterator = typename yh::iterator; + using const_iterator = typename yh::const_iterator; + using mapped_type = typename yh::mapped_type; + using size_type = typename yh::size_type; + using pool_size_type = typename yh::size_type; string_hash() { pool.Reserve(HASH_SIZE_DEFAULT * AVERAGEWORD_BUF); // reserve here } @@ -107,12 +107,12 @@ protected: public: using yh = THashMap<const C*, T, HashFcn, EqualTo>; - using iterator = typename yh::iterator; - using const_iterator = typename yh::const_iterator; - using mapped_type = typename yh::mapped_type; - using size_type = typename yh::size_type; - using key_type = typename yh::key_type; - using value_type = typename yh::value_type; + using iterator = typename yh::iterator; + using const_iterator = typename yh::const_iterator; + using mapped_type = typename yh::mapped_type; + using size_type = typename yh::size_type; + using key_type = typename yh::key_type; + using value_type = typename yh::value_type; THashWithSegmentedPoolForKeys(size_type hash_size = HASH_SIZE_DEFAULT, size_t segsize = HASH_SIZE_DEFAULT * AVERAGEWORD_BUF, bool afs = false) : yh(hash_size) @@ -178,13 +178,13 @@ public: template <class T, class HashFcn, class EqualTo> class segmented_string_hash: public THashWithSegmentedPoolForKeys<char, T, HashFcn, EqualTo> { public: - using Base = THashWithSegmentedPoolForKeys<char, T, HashFcn, EqualTo>; - using iterator = typename Base::iterator; - using const_iterator = typename Base::const_iterator; - using mapped_type = typename Base::mapped_type; - using size_type = typename Base::size_type; - using key_type = typename Base::key_type; - using value_type = typename Base::value_type; + using Base = THashWithSegmentedPoolForKeys<char, T, HashFcn, EqualTo>; + using iterator = typename Base::iterator; + using const_iterator = typename Base::const_iterator; + using mapped_type = typename Base::mapped_type; + using size_type = typename Base::size_type; + using key_type = typename Base::key_type; + using value_type = typename Base::value_type; public: segmented_string_hash(size_type hash_size = HASH_SIZE_DEFAULT, size_t segsize = HASH_SIZE_DEFAULT * AVERAGEWORD_BUF, bool afs = false) |