aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-02-05 20:04:45 +0300
committerAlexander Smirnov <alex@ydb.tech>2024-02-09 19:18:08 +0300
commitfb860f0696b32d7c7a66186c8e4fe79afd143987 (patch)
tree35d219c40e88e37f13db9a752d55184d8fd34cc1
parent154202ec708a6705518d3e09f1cfa9e940e7221c (diff)
downloadydb-fb860f0696b32d7c7a66186c8e4fe79afd143987.tar.gz
Intermediate changes
-rw-r--r--contrib/restricted/google/benchmark/src/sysinfo.cc2
-rw-r--r--contrib/restricted/googletest/googletest/src/gtest-port.cc2
-rw-r--r--yt/yt/build/ya.make2
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/restricted/google/benchmark/src/sysinfo.cc b/contrib/restricted/google/benchmark/src/sysinfo.cc
index 010bec78e1..ff05e32f39 100644
--- a/contrib/restricted/google/benchmark/src/sysinfo.cc
+++ b/contrib/restricted/google/benchmark/src/sysinfo.cc
@@ -41,7 +41,7 @@
#include <netdb.h>
#endif
#if defined(BENCHMARK_OS_QNX)
-#include <sys/syspage.h>
+#error #include <sys/syspage.h>
#endif
#if defined(BENCHMARK_OS_QURT)
#error #include <qurt.h>
diff --git a/contrib/restricted/googletest/googletest/src/gtest-port.cc b/contrib/restricted/googletest/googletest/src/gtest-port.cc
index 7b418f844c..c639f02c7b 100644
--- a/contrib/restricted/googletest/googletest/src/gtest-port.cc
+++ b/contrib/restricted/googletest/googletest/src/gtest-port.cc
@@ -72,7 +72,7 @@
#endif
#ifdef GTEST_OS_QNX
-#include <devctl.h>
+#error #include <devctl.h>
#include <fcntl.h>
#include <sys/procfs.h>
#endif // GTEST_OS_QNX
diff --git a/yt/yt/build/ya.make b/yt/yt/build/ya.make
index 81c093deff..55045f06e1 100644
--- a/yt/yt/build/ya.make
+++ b/yt/yt/build/ya.make
@@ -3,7 +3,7 @@ LIBRARY()
INCLUDE(${ARCADIA_ROOT}/yt/ya_cpp.make.inc)
SET(YT_VERSION_MAJOR 24)
-SET(YT_VERSION_MINOR 1)
+SET(YT_VERSION_MINOR 2)
DEFAULT(YT_VERSION_PATCH 0)
DEFAULT(YT_VERSION_BRANCH "local")