Restoring authorship annotation for Andrey Khalyavin <halyavin@gmail.com>. Commit 2 of 2.

1 files changed, 71 insertions, 71 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/include/__algorithm/merge.h b/contrib/libs/cxxsupp/libcxx/include/__algorithm/merge.h
index 481b504cab..480380db6c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__algorithm/merge.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__algorithm/merge.h
@@ -1,71 +1,71 @@
-//===----------------------------------------------------------------------===// 
-// 
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. 
-// See https://llvm.org/LICENSE.txt for license information. 
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception 
-// 
-//===----------------------------------------------------------------------===// 
- 
-#ifndef _LIBCPP___ALGORITHM_MERGE_H 
-#define _LIBCPP___ALGORITHM_MERGE_H 
- 
-#include <__config> 
-#include <__algorithm/comp.h> 
-#include <__algorithm/comp_ref_type.h> 
-#include <__algorithm/copy.h> 
-#include <__iterator/iterator_traits.h> 
- 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) 
-#pragma GCC system_header 
-#endif 
- 
-_LIBCPP_BEGIN_NAMESPACE_STD 
- 
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator> 
-_LIBCPP_CONSTEXPR_AFTER_CXX17 
-_OutputIterator 
-__merge(_InputIterator1 __first1, _InputIterator1 __last1, 
-        _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) 
-{ 
-    for (; __first1 != __last1; ++__result) 
-    { 
-        if (__first2 == __last2) 
-            return _VSTD::copy(__first1, __last1, __result); 
-        if (__comp(*__first2, *__first1)) 
-        { 
-            *__result = *__first2; 
-            ++__first2; 
-        } 
-        else 
-        { 
-            *__result = *__first1; 
-            ++__first1; 
-        } 
-    } 
-    return _VSTD::copy(__first2, __last2, __result); 
-} 
- 
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare> 
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 
-_OutputIterator 
-merge(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp) 
-{ 
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref; 
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp); 
-} 
- 
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator> 
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 
-_OutputIterator 
-merge(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result) 
-{ 
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1; 
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2; 
-    return _VSTD::merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>()); 
-} 
- 
-_LIBCPP_END_NAMESPACE_STD 
- 
-#endif // _LIBCPP___ALGORITHM_MERGE_H 
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ALGORITHM_MERGE_H
+#define _LIBCPP___ALGORITHM_MERGE_H
+
+#include <__config>
+#include <__algorithm/comp.h>
+#include <__algorithm/comp_ref_type.h>
+#include <__algorithm/copy.h>
+#include <__iterator/iterator_traits.h>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
+_LIBCPP_CONSTEXPR_AFTER_CXX17
+_OutputIterator
+__merge(_InputIterator1 __first1, _InputIterator1 __last1,
+        _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
+{
+    for (; __first1 != __last1; ++__result)
+    {
+        if (__first2 == __last2)
+            return _VSTD::copy(__first1, __last1, __result);
+        if (__comp(*__first2, *__first1))
+        {
+            *__result = *__first2;
+            ++__first2;
+        }
+        else
+        {
+            *__result = *__first1;
+            ++__first1;
+        }
+    }
+    return _VSTD::copy(__first2, __last2, __result);
+}
+
+template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_OutputIterator
+merge(_InputIterator1 __first1, _InputIterator1 __last1,
+      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
+{
+    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
+    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
+}
+
+template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
+_OutputIterator
+merge(_InputIterator1 __first1, _InputIterator1 __last1,
+      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
+{
+    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
+    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
+    return _VSTD::merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>());
+}
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP___ALGORITHM_MERGE_H