diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-04-20 17:55:28 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-04-20 17:55:28 +0300 |
| commit | e3cf5e1d7380e3763f4aa5a0edb8e4a7b011c3b8 (patch) | |
| tree | 5b522f7d6fab415363bf7ee70bcd258b4b2a506a | |
| parent | 31ff69685d432e9506ba2cad2e4cb05528021282 (diff) | |
| download | ydb-e3cf5e1d7380e3763f4aa5a0edb8e4a7b011c3b8.tar.gz | |
intermediate changes
ref:f2243b78f0917d7ce3c70b9377e96b0489c800c5
| -rw-r--r-- | build/rules/maps/maps.policy | 2 | ||||
| -rw-r--r-- | contrib/tools/bison/bison/src/muscle-tab.h | 1 | ||||
| -rw-r--r-- | contrib/tools/bison/gnulib/src/obstack.h | 2 | ||||
| -rw-r--r-- | contrib/tools/bison/gnulib/src/string--.h | 3 | ||||
| -rw-r--r-- | library/cpp/yt/misc/guid.h | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/build/rules/maps/maps.policy b/build/rules/maps/maps.policy index c8c0eca964..f541e4d05f 100644 --- a/build/rules/maps/maps.policy +++ b/build/rules/maps/maps.policy @@ -168,7 +168,7 @@ ALLOW yql/udfs/maps -> maps/ ALLOW maps_adv/ -> maps/ ALLOW maps_adv/ -> maps_adv/ ALLOW smb/ -> maps_adv/ -ALLOW geoadv/ -> maps_adv/geosmb/landlord/proto +ALLOW (geoadv/|direct/) -> maps_adv/geosmb/landlord/proto DENY .* -> maps_adv/ ALLOW sdg/library/python/revision_manager -> maps/wikimap/mapspro/libs/common diff --git a/contrib/tools/bison/bison/src/muscle-tab.h b/contrib/tools/bison/bison/src/muscle-tab.h index 0993f74ed7..2150327ba6 100644 --- a/contrib/tools/bison/bison/src/muscle-tab.h +++ b/contrib/tools/bison/bison/src/muscle-tab.h @@ -21,6 +21,7 @@ # define MUSCLE_TAB_H_ # include <quotearg.h> +# include <obstack.h> # include "location.h" diff --git a/contrib/tools/bison/gnulib/src/obstack.h b/contrib/tools/bison/gnulib/src/obstack.h index c57cc57b92..046fc58546 100644 --- a/contrib/tools/bison/gnulib/src/obstack.h +++ b/contrib/tools/bison/gnulib/src/obstack.h @@ -511,7 +511,7 @@ __extension__ \ } /* C++ */ #endif -#if defined(_WIN32) +#if !defined(obstack_printf) int obstack_printf(struct obstack *obs, const char *format, ...); #endif diff --git a/contrib/tools/bison/gnulib/src/string--.h b/contrib/tools/bison/gnulib/src/string--.h index 37cc3727f8..24a1932992 100644 --- a/contrib/tools/bison/gnulib/src/string--.h +++ b/contrib/tools/bison/gnulib/src/string--.h @@ -5,5 +5,6 @@ #if defined(_WIN32) void *rawmemchr(const void *s, int c); char *stpcpy(char *dest, const char *src); -int strverscmp(const char *s1, const char *s2); #endif + +int strverscmp(const char *s1, const char *s2); diff --git a/library/cpp/yt/misc/guid.h b/library/cpp/yt/misc/guid.h index 1257a57dcf..ce024885f7 100644 --- a/library/cpp/yt/misc/guid.h +++ b/library/cpp/yt/misc/guid.h @@ -54,8 +54,8 @@ struct TGuid constexpr TGuid(ui64 part0, ui64 part1); //! Copies an existing guid. - TGuid(const TGuid& other) = default; - TGuid& operator=(const TGuid& other) = default; + constexpr TGuid(const TGuid& other) noexcept = default; + constexpr TGuid& operator=(const TGuid& other) noexcept = default; //! Checks if TGuid is zero. bool IsEmpty() const; |