aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStepan Polokhin <ilikebigcat@yandex.ru>2022-02-10 16:46:29 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:29 +0300
commit1c8fad4dbdab65ce5d4d0740cd02f90c069b4f17 (patch)
tree1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /contrib
parent2206dbc39b1836bfe03187ac76eb9a70bfad4735 (diff)
downloadydb-1c8fad4dbdab65ce5d4d0740cd02f90c069b4f17.tar.gz
Restoring authorship annotation for Stepan Polokhin <ilikebigcat@yandex.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/highwayhash/highwayhash/state_helpers.h2
-rw-r--r--contrib/python/ya.make2
-rw-r--r--contrib/restricted/boost/boost/proto/expr.hpp2
-rw-r--r--contrib/restricted/boost/boost/proto/generate.hpp2
-rw-r--r--contrib/restricted/boost/boost/python/detail/unwind_type.hpp14
5 files changed, 11 insertions, 11 deletions
diff --git a/contrib/libs/highwayhash/highwayhash/state_helpers.h b/contrib/libs/highwayhash/highwayhash/state_helpers.h
index 0ac496cb68..4dd651260f 100644
--- a/contrib/libs/highwayhash/highwayhash/state_helpers.h
+++ b/contrib/libs/highwayhash/highwayhash/state_helpers.h
@@ -46,7 +46,7 @@ typedef unsigned long long HH_U64; // NOLINT
template <class State>
HH_INLINE void PaddedUpdate(const HH_U64 size, const char* remaining_bytes,
const HH_U64 remaining_size, State* state) {
- HH_ALIGNAS(32) char final_packet[State::kPacketSize] = {0};
+ HH_ALIGNAS(32) char final_packet[State::kPacketSize] = {0};
// This layout matches the AVX-2 specialization in highway_tree_hash.h.
uint32_t packet4 = static_cast<uint32_t>(size) << 24;
diff --git a/contrib/python/ya.make b/contrib/python/ya.make
index e783fe4139..d01ced9f3a 100644
--- a/contrib/python/ya.make
+++ b/contrib/python/ya.make
@@ -300,7 +300,7 @@ RECURSE(
django-tastypie
django-test-migrations
django-timezone-field
- django-treebeard
+ django-treebeard
django-waffle
django-webpack-loader
django-webtest
diff --git a/contrib/restricted/boost/boost/proto/expr.hpp b/contrib/restricted/boost/boost/proto/expr.hpp
index 189158991d..87862cf6bd 100644
--- a/contrib/restricted/boost/boost/proto/expr.hpp
+++ b/contrib/restricted/boost/boost/proto/expr.hpp
@@ -92,7 +92,7 @@ namespace boost { namespace proto
// Work-around for:
// https://connect.microsoft.com/VisualStudio/feedback/details/765449/codegen-stack-corruption-using-runtime-checks-when-aggregate-initializing-struct
- #if BOOST_WORKAROUND(BOOST_MSVC, < 1800)
+ #if BOOST_WORKAROUND(BOOST_MSVC, < 1800)
template<typename T, typename Expr, typename C, typename U>
BOOST_FORCEINLINE
Expr make_terminal(T &t, Expr *, proto::term<U C::*> *)
diff --git a/contrib/restricted/boost/boost/proto/generate.hpp b/contrib/restricted/boost/boost/proto/generate.hpp
index ff46729006..3a600c4853 100644
--- a/contrib/restricted/boost/boost/proto/generate.hpp
+++ b/contrib/restricted/boost/boost/proto/generate.hpp
@@ -230,7 +230,7 @@ namespace boost { namespace proto
// Work-around for:
// https://connect.microsoft.com/VisualStudio/feedback/details/765449/codegen-stack-corruption-using-runtime-checks-when-aggregate-initializing-struct
- #if BOOST_WORKAROUND(BOOST_MSVC, < 1800)
+ #if BOOST_WORKAROUND(BOOST_MSVC, < 1800)
template<typename Class, typename Member>
BOOST_FORCEINLINE
Extends<expr<tag::terminal, proto::term<Member Class::*> > > operator ()(expr<tag::terminal, proto::term<Member Class::*> > const &e) const
diff --git a/contrib/restricted/boost/boost/python/detail/unwind_type.hpp b/contrib/restricted/boost/boost/python/detail/unwind_type.hpp
index fbece89437..b81bf7c898 100644
--- a/contrib/restricted/boost/boost/python/detail/unwind_type.hpp
+++ b/contrib/restricted/boost/boost/python/detail/unwind_type.hpp
@@ -11,15 +11,15 @@
namespace boost { namespace python { namespace detail {
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
-// If forward declared, msvc6.5 does not recognize them as inline.
-// However, as of msvc14.15 (_MSC_VER 1915/Visual Studio 15.8.0) name lookup is now consistent with other compilers.
-// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+// If forward declared, msvc6.5 does not recognize them as inline.
+// However, as of msvc14.15 (_MSC_VER 1915/Visual Studio 15.8.0) name lookup is now consistent with other compilers.
+// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
template <class Generator, class U>
inline typename Generator::result_type
unwind_type(U const& p, Generator* = 0);
-// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
template <class Generator, class U>
inline typename Generator::result_type
unwind_type(boost::type<U>*p = 0, Generator* = 0);
@@ -85,7 +85,7 @@ struct unwind_helper<false>
template <class Generator, class U>
inline typename Generator::result_type
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
unwind_type(U const& p, Generator*)
#else
unwind_type(U const& p, Generator* = 0)
@@ -150,7 +150,7 @@ struct unwind_helper2<reference_to_pointer_>
// why bother?
template <class Generator, class U>
inline typename Generator::result_type
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
unwind_type(boost::type<U>*, Generator*)
#else
unwind_type(boost::type<U>*p =0, Generator* =0)