Handle review comments

Author: ckormanyos

include/bits/stl_iterator.h

@@ -2151,20 +2151,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	{ return __y._M_length <=> __x._M_length; }
 
     private:
+      template<input_or_output_iterator _It2> friend class counted_iterator;
+
       _It _M_current = _It();
       iter_difference_t<_It> _M_length = 0;
 
-      template<input_or_output_iterator _It2> friend class counted_iterator;
-
       friend constexpr iter_rvalue_reference_t<_It>
-      iter_move(const counted_iterator& __i) noexcept(noexcept(ranges::iter_move(__i._M_current)))
+      iter_move(const counted_iterator& __i)
+      noexcept(noexcept(ranges::iter_move(__i._M_current)))
       requires input_iterator<_It>
       { return ranges::iter_move(__i._M_current); }
 
       template<indirectly_swappable<_It> _It2>
-      friend constexpr void iter_swap(const counted_iterator& __x, const counted_iterator<_It2>& __y) noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current)))
-      { ranges::iter_swap(__x._M_current, __y._M_current); }
-
+	friend constexpr void
+	iter_swap(const counted_iterator& __x,
+		  const counted_iterator<_It2>& __y)
+	noexcept(noexcept(ranges::iter_swap(__x._M_current, __y._M_current)))
+	{ ranges::iter_swap(__x._M_current, __y._M_current); }
     };
 
   template<typename _It>

include/cmath

@@ -611,27 +611,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #undef islessgreater
 #undef isunordered
 
-#if defined(FP_NAN)
-#undef FP_NAN
-#endif
-#if defined(FP_INFINITE)
-#undef FP_INFINITE
-#endif
-#if defined(FP_ZERO)
-#undef FP_ZERO
-#endif
-#if defined(FP_SUBNORMAL)
-#undef FP_SUBNORMAL
-#endif
-#if defined(FP_NORMAL)
-#undef FP_NORMAL
-#endif
-
+#if !defined(FP_NAN) && !defined(FP_INFINITE) && !defined(FP_ZERO) \
+  && !defined(FP_SUBNORMAL) && !defined(FP_NORMAL)
 #define FP_NAN         0
 #define FP_INFINITE    1
 #define FP_ZERO        2
 #define FP_SUBNORMAL   3
 #define FP_NORMAL      4
+#elif !defined(FP_NAN) || !defined(FP_INFINITE) || !defined(FP_ZERO) \
+  || !defined(FP_SUBNORMAL) || !defined(FP_NORMAL)
+#error "Some floating-point number classification macros are missing."
+#error "Either define all of them or define none of them so that <cmath> can do it."
+#endif
 
 #if __cplusplus >= 201103L