diff options
author | insight <insight@yandex-team.ru> | 2022-02-10 16:46:59 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:59 +0300 |
commit | 122c87ebe5797d52f1800afb02c87f751135d0a4 (patch) | |
tree | b83306b6e37edeea782e9eed673d89286c4fef35 | |
parent | 3649e6106e994e7f969877e4b10207d3556454b2 (diff) | |
download | ydb-122c87ebe5797d52f1800afb02c87f751135d0a4.tar.gz |
Restoring authorship annotation for <insight@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | contrib/libs/ya.make | 2 | ||||
-rw-r--r-- | contrib/python/ya.make | 2 | ||||
-rw-r--r-- | library/cpp/object_factory/object_factory.h | 16 | ||||
-rw-r--r-- | library/cpp/yson/node/node.cpp | 18 | ||||
-rw-r--r-- | library/cpp/yson/node/node.h | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index a7ef1219bd..9c4640fdcf 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -64,7 +64,7 @@ RECURSE( farmhash/ut faster-rnnlm fastlz - fastops + fastops fcgi ffmpeg-3 ffmpeg-3.4.1 diff --git a/contrib/python/ya.make b/contrib/python/ya.make index 4f0efcf691..d01ced9f3a 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -158,7 +158,7 @@ RECURSE( clickhouse-cityhash clickhouse-driver clickhouse-sqlalchemy - cloudpickle + cloudpickle color colorama coloredlogs diff --git a/library/cpp/object_factory/object_factory.h b/library/cpp/object_factory/object_factory.h index a389f7b651..96cc11bcfd 100644 --- a/library/cpp/object_factory/object_factory.h +++ b/library/cpp/object_factory/object_factory.h @@ -23,7 +23,7 @@ namespace NObjectFactory { virtual ~IFactoryObjectCreator() { } }; - + #define FACTORY_OBJECT_NAME(Name) \ static TString GetTypeName() { \ return #Name; \ @@ -31,7 +31,7 @@ namespace NObjectFactory { virtual TString GetType() const override { \ return #Name; \ } - + template <class TBaseProduct, class TDerivedProduct, class... TArgs> class TFactoryObjectCreator: public IFactoryObjectCreator<TBaseProduct, TArgs...> { TDerivedProduct* Create(TArgs... args) const override { @@ -45,13 +45,13 @@ namespace NObjectFactory { return new TDerivedProduct(); } }; - + template <class P, class K, class... TArgs> class IObjectFactory { public: typedef P TProduct; typedef K TKey; - + public: template <class TDerivedProduct> void Register(const TKey& key, IFactoryObjectCreator<TProduct, TArgs...>* creator) { @@ -102,7 +102,7 @@ namespace NObjectFactory { IFactoryObjectCreator<TProduct, void>* creator = IObjectFactory<TProduct, TKey, void>::GetCreator(key); return creator == nullptr ? nullptr : creator->Create(); } - + static TString KeysDebugString() { TSet<TString> keys; Singleton<TObjectFactory<TProduct, TKey>>()->GetKeys(keys); @@ -112,7 +112,7 @@ namespace NObjectFactory { } return keysStr; } - + static TProduct* Construct(const TKey& key, const TKey& defKey) { TProduct* result = Singleton<TObjectFactory<TProduct, TKey>>()->Create(key); if (!result && !!defKey) { @@ -195,7 +195,7 @@ namespace NObjectFactory { static TProduct* Construct(const TKey& key, TArgs... args) { return Singleton<TParametrizedObjectFactory<TProduct, TKey, TArgs...>>()->Create(key, std::forward<TArgs>(args)...); } - + template <class... Args> static THolder<TProduct> VerifiedConstruct(Args&&... args) { auto result = MakeHolder(std::forward<Args>(args)...); @@ -211,7 +211,7 @@ namespace NObjectFactory { static void GetRegisteredKeys(TSet<TKey>& keys) { return Singleton<TParametrizedObjectFactory<TProduct, TKey, TArgs...>>()->GetKeys(keys); } - + static TSet<TKey> GetRegisteredKeys() { TSet<TKey> keys; Singleton<TParametrizedObjectFactory<TProduct, TKey, TArgs...>>()->GetKeys(keys); diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp index b38c32357a..b39e070718 100644 --- a/library/cpp/yson/node/node.cpp +++ b/library/cpp/yson/node/node.cpp @@ -540,17 +540,17 @@ TNode& TNode::operator[](const TStringBuf key) return std::get<TMapType>(Value_)[key]; } -const TNode& TNode::At(const TStringBuf key) const { - CheckType(Map); +const TNode& TNode::At(const TStringBuf key) const { + CheckType(Map); const auto& map = std::get<TMapType>(Value_); - TMapType::const_iterator i = map.find(key); - if (i == map.end()) { + TMapType::const_iterator i = map.find(key); + if (i == map.end()) { ythrow TLookupError() << "Cannot find key " << key; - } else { - return i->second; - } -} - + } else { + return i->second; + } +} + TNode& TNode::At(const TStringBuf key) { CheckType(Map); auto& map = std::get<TMapType>(Value_); diff --git a/library/cpp/yson/node/node.h b/library/cpp/yson/node/node.h index c51f177e97..5f90f95df0 100644 --- a/library/cpp/yson/node/node.h +++ b/library/cpp/yson/node/node.h @@ -202,7 +202,7 @@ public: const TNode& operator[](const TStringBuf key) const; TNode& operator[](const TStringBuf key); - const TNode& At(const TStringBuf key) const; + const TNode& At(const TStringBuf key) const; TNode& At(const TStringBuf key); // map getters |