X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fbits%2Fstl_algo.h;h=3d37091a9b4bc4c719316a903750fca43e93eaf9;hb=83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c;hp=e63fe66852e33db669c74c8e7cee10fe3a9c7fe0;hpb=cf0fded5d837bad590eb091d8a3dc4898872560f;p=thirdparty%2Fgcc.git

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index e63fe66852e3..3d37091a9b4b 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -1,6 +1,6 @@
 // Algorithm implementation -*- C++ -*-
 
-// Copyright (C) 2001-2022 Free Software Foundation, Inc.
+// Copyright (C) 2001-2023 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
@@ -2458,13 +2458,14 @@ _GLIBCXX_END_INLINE_ABI_NAMESPACE(_V2)
 
 	  _BidirectionalIterator __new_middle
 	    = std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-				     __len1 - __len11, __len22,
+				     _Distance(__len1 - __len11), __len22,
 				     __buffer, __buffer_size);
 	  std::__merge_adaptive_resize(__first, __first_cut, __new_middle,
 				       __len11, __len22,
 				       __buffer, __buffer_size, __comp);
 	  std::__merge_adaptive_resize(__new_middle, __second_cut, __last,
-				       __len1 - __len11, __len2 - __len22,
+				       _Distance(__len1 - __len11),
+				       _Distance(__len2 - __len22),
 				       __buffer, __buffer_size, __comp);
 	}
     }
@@ -4594,7 +4595,6 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
 	      std::iter_swap(__i, __j);
 	  }
     }
-#endif // HOSTED
 
   /**
    *  @brief Shuffle the elements of a sequence using a random number
@@ -4638,6 +4638,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
 	    std::iter_swap(__i, __j);
 	}
     }
+#endif // HOSTED
 #endif // C++11 || USE_DEPRECATED
 
   /**