diff options
author | heretic <heretic@yandex-team.ru> | 2022-02-10 16:45:46 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:46 +0300 |
commit | 81eddc8c0b55990194e112b02d127b87d54164a9 (patch) | |
tree | 9142afc54d335ea52910662635b898e79e192e49 /library | |
parent | 397cbe258b9e064f49c4ca575279f02f39fef76e (diff) | |
download | ydb-81eddc8c0b55990194e112b02d127b87d54164a9.tar.gz |
Restoring authorship annotation for <heretic@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/build_info/build_info.h | 2 | ||||
-rw-r--r-- | library/cpp/build_info/build_info_static.cpp | 52 | ||||
-rw-r--r-- | library/cpp/build_info/build_info_static.h | 20 | ||||
-rw-r--r-- | library/cpp/build_info/ya.make | 6 | ||||
-rw-r--r-- | library/cpp/containers/ya.make | 2 | ||||
-rw-r--r-- | library/cpp/grpc/server/grpc_server.cpp | 2 | ||||
-rw-r--r-- | library/cpp/resource/registry.cpp | 40 | ||||
-rw-r--r-- | library/python/testing/yatest_common/yatest/common/runtime.py | 16 |
8 files changed, 70 insertions, 70 deletions
diff --git a/library/cpp/build_info/build_info.h b/library/cpp/build_info/build_info.h index 3bc756af58..a494870ba3 100644 --- a/library/cpp/build_info/build_info.h +++ b/library/cpp/build_info/build_info.h @@ -1,7 +1,7 @@ #pragma once #include "sandbox.h" -#include "build_info_static.h" +#include "build_info_static.h" #if defined(__cplusplus) extern "C" { diff --git a/library/cpp/build_info/build_info_static.cpp b/library/cpp/build_info/build_info_static.cpp index 4f99f7ed3c..238fb1ecb0 100644 --- a/library/cpp/build_info/build_info_static.cpp +++ b/library/cpp/build_info/build_info_static.cpp @@ -1,27 +1,27 @@ -#include "build_info_static.h" - +#include "build_info_static.h" + #include <library/cpp/build_info/buildinfo_data.h> - -extern "C" const char* GetCompilerVersion() { -#if defined(BUILD_COMPILER_VERSION) - return BUILD_COMPILER_VERSION; -#else - return ""; -#endif -} - -extern "C" const char* GetCompilerFlags() { -#if defined(BUILD_COMPILER_FLAGS) - return BUILD_COMPILER_FLAGS; -#else - return ""; -#endif -} - -extern "C" const char* GetBuildInfo() { -#if defined(BUILD_INFO) - return BUILD_INFO; -#else - return ""; -#endif -} + +extern "C" const char* GetCompilerVersion() { +#if defined(BUILD_COMPILER_VERSION) + return BUILD_COMPILER_VERSION; +#else + return ""; +#endif +} + +extern "C" const char* GetCompilerFlags() { +#if defined(BUILD_COMPILER_FLAGS) + return BUILD_COMPILER_FLAGS; +#else + return ""; +#endif +} + +extern "C" const char* GetBuildInfo() { +#if defined(BUILD_INFO) + return BUILD_INFO; +#else + return ""; +#endif +} diff --git a/library/cpp/build_info/build_info_static.h b/library/cpp/build_info/build_info_static.h index 855b3fd12a..9bf9939dd9 100644 --- a/library/cpp/build_info/build_info_static.h +++ b/library/cpp/build_info/build_info_static.h @@ -1,13 +1,13 @@ -#pragma once - -#if defined(__cplusplus) -extern "C" { -#endif - +#pragma once + +#if defined(__cplusplus) +extern "C" { +#endif + const char* GetCompilerVersion(); const char* GetCompilerFlags(); // "-std=c++14 -DNDEBUG -O2 -m64 ..." const char* GetBuildInfo(); // Compiler version and flags - -#if defined(__cplusplus) -} -#endif + +#if defined(__cplusplus) +} +#endif diff --git a/library/cpp/build_info/ya.make b/library/cpp/build_info/ya.make index de32c7414f..99886a8893 100644 --- a/library/cpp/build_info/ya.make +++ b/library/cpp/build_info/ya.make @@ -3,14 +3,14 @@ LIBRARY() OWNER( mvel snowball - heretic + heretic ) DEFAULT(SANDBOX_TASK_ID 0) DEFAULT(KOSHER_SVN_VERSION "") CREATE_BUILDINFO_FOR(buildinfo_data.h) - + PEERDIR( library/cpp/string_utils/base64 ) @@ -18,7 +18,7 @@ PEERDIR( SRCS( sandbox.cpp.in build_info.cpp.in - build_info_static.cpp + build_info_static.cpp ) END() diff --git a/library/cpp/containers/ya.make b/library/cpp/containers/ya.make index e384470eaf..4b1b315e6a 100644 --- a/library/cpp/containers/ya.make +++ b/library/cpp/containers/ya.make @@ -1,7 +1,7 @@ RECURSE( 2d_array absl_flat_hash - absl_tstring_flat_hash + absl_tstring_flat_hash atomizer bitseq bitseq/ut diff --git a/library/cpp/grpc/server/grpc_server.cpp b/library/cpp/grpc/server/grpc_server.cpp index 8acdd1c942..7437b7a8f5 100644 --- a/library/cpp/grpc/server/grpc_server.cpp +++ b/library/cpp/grpc/server/grpc_server.cpp @@ -52,7 +52,7 @@ void TGRpcServer::AddService(IGRpcServicePtr service) { } void TGRpcServer::Start() { - TString server_address(Join(":", Options_.Host, Options_.Port)); // https://st.yandex-team.ru/DTCC-695 + TString server_address(Join(":", Options_.Host, Options_.Port)); // https://st.yandex-team.ru/DTCC-695 using grpc::ServerBuilder; using grpc::ResourceQuota; ServerBuilder builder; diff --git a/library/cpp/resource/registry.cpp b/library/cpp/resource/registry.cpp index fe584bce7b..66001c4769 100644 --- a/library/cpp/resource/registry.cpp +++ b/library/cpp/resource/registry.cpp @@ -51,16 +51,16 @@ namespace { bool FindExact(const TStringBuf key, TString* out) const override { if (TDescriptor* const* res = FindPtr(key)) { - // temporary - // https://st.yandex-team.ru/DEVTOOLS-3985 - try { - *out = Decompress((*res)->second); - } catch (const yexception& e) { + // temporary + // https://st.yandex-team.ru/DEVTOOLS-3985 + try { + *out = Decompress((*res)->second); + } catch (const yexception& e) { if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { - Cerr << "Can't decompress resource " << key << Endl << e.what() << Endl; - } - throw e; - } + Cerr << "Can't decompress resource " << key << Endl << e.what() << Endl; + } + throw e; + } return true; } @@ -71,18 +71,18 @@ namespace { void FindMatch(const TStringBuf subkey, IMatch& cb) const override { for (const auto& it : *this) { if (it.first.StartsWith(subkey)) { - // temporary - // https://st.yandex-team.ru/DEVTOOLS-3985 - try { - const TResource res = { - it.first, Decompress(it.second->second)}; - cb.OnMatch(res); - } catch (const yexception& e) { + // temporary + // https://st.yandex-team.ru/DEVTOOLS-3985 + try { + const TResource res = { + it.first, Decompress(it.second->second)}; + cb.OnMatch(res); + } catch (const yexception& e) { if (GetEnv("RESOURCE_DECOMPRESS_DIAG")) { - Cerr << "Can't decompress resource " << it.first << Endl << e.what() << Endl; - } - throw e; - } + Cerr << "Can't decompress resource " << it.first << Endl << e.what() << Endl; + } + throw e; + } } } } diff --git a/library/python/testing/yatest_common/yatest/common/runtime.py b/library/python/testing/yatest_common/yatest/common/runtime.py index a0d4eda0ce..e55e193446 100644 --- a/library/python/testing/yatest_common/yatest/common/runtime.py +++ b/library/python/testing/yatest_common/yatest/common/runtime.py @@ -1,6 +1,6 @@ import errno import functools -import json +import json import os import threading @@ -254,13 +254,13 @@ def cxx_compiler_path(): return os.environ.get("YA_CXX") -def global_resources(): - try: - return json.loads(os.environ.get("YA_GLOBAL_RESOURCES")) - except (TypeError, ValueError): - return {} - - +def global_resources(): + try: + return json.loads(os.environ.get("YA_GLOBAL_RESOURCES")) + except (TypeError, ValueError): + return {} + + def _register_core(name, binary_path, core_path, bt_path, pbt_path): config = _get_ya_config() |