aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp
diff options
context:
space:
mode:
authorMaxim Yurchuk <maxim-yurchuk@ydb.tech>2024-11-14 12:50:31 +0300
committerMaxim Yurchuk <maxim-yurchuk@ydb.tech>2024-11-14 12:50:31 +0300
commit3e21a92839dc67a2275572af64757d35ecc5afb2 (patch)
tree63bdee95e6a44efffbc8e2c182247d938917ab43 /library/cpp
parentdfcc463f7317a41d7700e0cfbdee33a46985cc2b (diff)
parente667baaa857655a17da06aaf7ca0188e3f0178d8 (diff)
downloadydb-3e21a92839dc67a2275572af64757d35ecc5afb2.tar.gz
Merge branch 'rightlib' into mergelibs-yurchuk-manual
Diffstat (limited to 'library/cpp')
-rw-r--r--library/cpp/tld/tlds-alpha-by-domain.txt2
-rw-r--r--library/cpp/yt/threading/atomic_object-inl.h4
-rw-r--r--library/cpp/yt/threading/atomic_object.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt
index 3b4fd6d6821..75edec6f550 100644
--- a/library/cpp/tld/tlds-alpha-by-domain.txt
+++ b/library/cpp/tld/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2024111000, Last Updated Sun Nov 10 07:07:01 2024 UTC
+# Version 2024111300, Last Updated Wed Nov 13 07:07:01 2024 UTC
AAA
AARP
ABB
diff --git a/library/cpp/yt/threading/atomic_object-inl.h b/library/cpp/yt/threading/atomic_object-inl.h
index 452f5a0bc77..fc8238cc83c 100644
--- a/library/cpp/yt/threading/atomic_object-inl.h
+++ b/library/cpp/yt/threading/atomic_object-inl.h
@@ -4,7 +4,7 @@
#include "atomic_object.h"
#endif
-namespace NYT {
+namespace NYT::NThreading {
////////////////////////////////////////////////////////////////////////////////
@@ -94,4 +94,4 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
////////////////////////////////////////////////////////////////////////////////
-} // namespace NYT
+} // namespace NYT::NThreading
diff --git a/library/cpp/yt/threading/atomic_object.h b/library/cpp/yt/threading/atomic_object.h
index e986f872a08..232a567e2dc 100644
--- a/library/cpp/yt/threading/atomic_object.h
+++ b/library/cpp/yt/threading/atomic_object.h
@@ -4,7 +4,7 @@
#include <concepts>
-namespace NYT {
+namespace NYT::NThreading {
////////////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
////////////////////////////////////////////////////////////////////////////////
-} // namespace NYT
+} // namespace NYT::NThreading
#define ATOMIC_OBJECT_INL_H_
#include "atomic_object-inl.h"