summaryrefslogtreecommitdiffstats
path: root/contrib/restricted
diff options
context:
space:
mode:
authordanlark <[email protected]>2022-02-10 16:46:10 +0300
committerDaniil Cherednik <[email protected]>2022-02-10 16:46:10 +0300
commitbaa58daefa91fde4b4769facdbd2903763b9c6a8 (patch)
tree1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /contrib/restricted
parent3426a9bc7f169ae9da54cef557ad2a33f6e8eee0 (diff)
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'contrib/restricted')
-rw-r--r--contrib/restricted/boost/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp6
-rw-r--r--contrib/restricted/boost/boost/thread/lockable_traits.hpp16
-rw-r--r--contrib/restricted/libffi/src/x86/ffi.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/contrib/restricted/boost/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp b/contrib/restricted/boost/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
index 73dbc010cfc..25dfe54c987 100644
--- a/contrib/restricted/boost/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
+++ b/contrib/restricted/boost/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
@@ -34,7 +34,7 @@ namespace detail
inline void atomic_increment( register long * pw )
{
- int a;
+ int a;
asm
{
@@ -49,7 +49,7 @@ loop:
inline long atomic_decrement( register long * pw )
{
- int a;
+ int a;
asm
{
@@ -70,7 +70,7 @@ loop:
inline long atomic_conditional_increment( register long * pw )
{
- int a;
+ int a;
asm
{
diff --git a/contrib/restricted/boost/boost/thread/lockable_traits.hpp b/contrib/restricted/boost/boost/thread/lockable_traits.hpp
index e645c4af3f8..2dd91639ea9 100644
--- a/contrib/restricted/boost/boost/thread/lockable_traits.hpp
+++ b/contrib/restricted/boost/boost/thread/lockable_traits.hpp
@@ -112,10 +112,10 @@ namespace boost
template<typename U,typename V>
static true_type has_member(V (U::*)());
-#if __cpp_noexcept_function_type
- template<typename U,typename V>
- static true_type has_member(V (U::*)() noexcept);
-#endif
+#if __cpp_noexcept_function_type
+ template<typename U,typename V>
+ static true_type has_member(V (U::*)() noexcept);
+#endif
template<typename U>
static false_type has_member(U);
@@ -140,11 +140,11 @@ namespace boost
template<typename U>
static true_type has_member(bool (U::*)());
-#if __cpp_noexcept_function_type
+#if __cpp_noexcept_function_type
+ template<typename U>
+ static true_type has_member(bool (U::*)() noexcept);
+#endif
template<typename U>
- static true_type has_member(bool (U::*)() noexcept);
-#endif
- template<typename U>
static false_type has_member(U);
BOOST_STATIC_CONSTANT(
diff --git a/contrib/restricted/libffi/src/x86/ffi.c b/contrib/restricted/libffi/src/x86/ffi.c
index 0e02c319cf6..9a592185a1d 100644
--- a/contrib/restricted/libffi/src/x86/ffi.c
+++ b/contrib/restricted/libffi/src/x86/ffi.c
@@ -426,7 +426,7 @@ ffi_closure_inner (struct closure_frame *frame, char *stack)
int cabi, i, n, flags, dir, narg_reg;
const struct abi_params *pabi;
ffi_type **arg_types;
- char *argp;
+ char *argp;
void *rvalue;
void **avalue;