]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - libstdc++-v3/include/bits/ranges_algobase.h
Update copyright years.
[thirdparty/gcc.git] / libstdc++-v3 / include / bits / ranges_algobase.h
index 9929e5e828b8b83e79fe43d383cc51f64635e80a..e26a73a27d6801da0e7933baf1cdefa24fb6bd76 100644 (file)
@@ -1,6 +1,6 @@
 // Core algorithmic facilities -*- C++ -*-
 
-// Copyright (C) 2020-2021 Free Software Foundation, Inc.
+// Copyright (C) 2020-2024 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -33,7 +33,6 @@
 #if __cplusplus > 201703L
 
 #include <compare>
-#include <bits/stl_iterator_base_types.h>
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 #include <bits/ranges_base.h> // ranges::begin, ranges::range etc.
@@ -240,7 +239,7 @@ namespace ranges
        {
          auto [__in,__out]
            = ranges::__copy_or_move<_IsMove>(__first.base(), __last.base(),
-                                             __result);
+                                             std::move(__result));
          return {decltype(__first){__in}, std::move(__out)};
        }
       else if constexpr (__is_normal_iterator<_Out>)
@@ -251,9 +250,7 @@ namespace ranges
        }
       else if constexpr (sized_sentinel_for<_Sent, _Iter>)
        {
-#ifdef __cpp_lib_is_constant_evaluated
-         if (!std::is_constant_evaluated())
-#endif
+         if (!std::__is_constant_evaluated())
            {
              if constexpr (__memcpyable<_Iter, _Out>::__value)
                {
@@ -388,9 +385,7 @@ namespace ranges
        }
       else if constexpr (sized_sentinel_for<_Sent, _Iter>)
        {
-#ifdef __cpp_lib_is_constant_evaluated
-         if (!std::is_constant_evaluated())
-#endif
+         if (!std::__is_constant_evaluated())
            {
              if constexpr (__memcpyable<_Out, _Iter>::__value)
                {
@@ -535,9 +530,7 @@ namespace ranges
                          && __is_byte<remove_pointer_t<_Out>>::__value
                          && integral<_Tp>)
              {
-#ifdef __cpp_lib_is_constant_evaluated
-               if (!std::is_constant_evaluated())
-#endif
+               if (!std::__is_constant_evaluated())
                  {
                    __builtin_memset(__first,
                                     static_cast<unsigned char>(__value),