From eed2c818e981f73b736fc6fcc5e14f147dc93ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 11 Sep 2023 12:15:30 +0200
Subject: [PATCH] Use a common prefix for internal singles-related macros.

Matches the same change in Corrade.
---
 src/Magnum/Math/Angle.h             | 4 ++--
 src/Magnum/Math/Bezier.h            | 2 +-
 src/Magnum/Math/BitVector.h         | 4 ++--
 src/Magnum/Math/Color.h             | 4 ++--
 src/Magnum/Math/Complex.h           | 4 ++--
 src/Magnum/Math/CubicHermite.h      | 2 +-
 src/Magnum/Math/Dual.h              | 4 ++--
 src/Magnum/Math/DualComplex.h       | 2 +-
 src/Magnum/Math/DualQuaternion.h    | 2 +-
 src/Magnum/Math/Frustum.h           | 4 ++--
 src/Magnum/Math/Half.h              | 4 ++--
 src/Magnum/Math/Quaternion.h        | 4 ++--
 src/Magnum/Math/Range.h             | 2 +-
 src/Magnum/Math/RectangularMatrix.h | 2 +-
 src/Magnum/Math/Vector.h            | 4 ++--
 src/singles/base.h                  | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h
index 8bb636d0d..5a022a73a 100644
--- a/src/Magnum/Math/Angle.h
+++ b/src/Magnum/Math/Angle.h
@@ -29,7 +29,7 @@
  * @brief Class @ref Magnum::Math::Deg, @ref Magnum::Math::Rad, literal @link Magnum::Math::Literals::operator""_degf() @endlink, @link Magnum::Math::Literals::operator""_radf() @endlink, @link Magnum::Math::Literals::operator""_deg() @endlink, @link Magnum::Math::Literals::operator""_rad() @endlink
  */
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 
@@ -228,7 +228,7 @@ constexpr Rad<Float> operator "" _radf(long double value) { return Rad<Float>(Fl
 template<class T> constexpr Deg<T>::Deg(Unit<Rad, T> value): Unit<Math::Deg, T>(T(180)*T(value)/Math::Constants<T>::pi()) {}
 template<class T> constexpr Rad<T>::Rad(Unit<Deg, T> value): Unit<Math::Rad, T>(T(value)*Math::Constants<T>::pi()/T(180)) {}
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Rad} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Unit<Rad, T>& value) {
     if(debug.immediateFlags() >= Corrade::Utility::Debug::Flag::Packed)
diff --git a/src/Magnum/Math/Bezier.h b/src/Magnum/Math/Bezier.h
index 3f604cd7a..d13737b5f 100644
--- a/src/Magnum/Math/Bezier.h
+++ b/src/Magnum/Math/Bezier.h
@@ -298,7 +298,7 @@ Convenience alternative to @cpp CubicBezier<3, T> @ce. See @ref CubicBezier and
 template<class T> using CubicBezier3D = CubicBezier<3, T>;
 #endif
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Bezier} */
 template<UnsignedInt order, UnsignedInt dimensions, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Bezier<order, dimensions, T>& value) {
     debug << "Bezier(" << Corrade::Utility::Debug::nospace;
diff --git a/src/Magnum/Math/BitVector.h b/src/Magnum/Math/BitVector.h
index 86d1af412..52e579ce2 100644
--- a/src/Magnum/Math/BitVector.h
+++ b/src/Magnum/Math/BitVector.h
@@ -32,7 +32,7 @@
 
 #include <type_traits>
 #include <Corrade/Containers/sequenceHelpers.h>
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 
@@ -329,7 +329,7 @@ template<std::size_t size> class BitVector {
         UnsignedByte _data[DataSize];
 };
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /**
 @debugoperator{BitVector}
 @m_since_latest
diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h
index f826180dd..d1a4f6a91 100644
--- a/src/Magnum/Math/Color.h
+++ b/src/Magnum/Math/Color.h
@@ -1341,7 +1341,7 @@ template<class T> struct ColorHsv {
     T value;
 };
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{ColorHsv} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const ColorHsv<T>& value) {
     return debug << "ColorHsv(" << Corrade::Utility::Debug::nospace << value.hue
@@ -1523,7 +1523,7 @@ inline Color4<Float> operator "" _srgbaf(unsigned long long value) {
 
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /**
 @debugoperator{Color3}
 
diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h
index d0d49b507..c78026269 100644
--- a/src/Magnum/Math/Complex.h
+++ b/src/Magnum/Math/Complex.h
@@ -29,7 +29,7 @@
  * @brief Class @ref Magnum::Math::Complex, function @ref Magnum::Math::dot(), @ref Magnum::Math::angle()
  */
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 #include <Corrade/Utility/DebugAssert.h>
@@ -657,7 +657,7 @@ template<class T> inline Complex<T> Complex<T>::fromMatrix(const Matrix2x2<T>& m
     return Implementation::complexFromMatrix(matrix);
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Complex} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Complex<T>& value) {
     return debug << "Complex(" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/CubicHermite.h b/src/Magnum/Math/CubicHermite.h
index 4c23509e5..ac6a71e6b 100644
--- a/src/Magnum/Math/CubicHermite.h
+++ b/src/Magnum/Math/CubicHermite.h
@@ -278,7 +278,7 @@ Convenience alternative to @cpp CubicHermite<Quaternion<T>> @ce. See
 template<class T> using CubicHermiteQuaternion = CubicHermite<Quaternion<T>>;
 #endif
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{CubicHermite} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const CubicHermite<T>& value) {
     return debug << "CubicHermite(" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h
index 842830111..78a5afa9a 100644
--- a/src/Magnum/Math/Dual.h
+++ b/src/Magnum/Math/Dual.h
@@ -29,7 +29,7 @@
  * @brief Class @ref Magnum::Math::Dual
  */
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 #include <Corrade/Utility/StlMath.h>
@@ -374,7 +374,7 @@ template<class T, class U, class V = typename std::enable_if<!Implementation::Is
     }
 #endif
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Dual} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Dual<T>& value) {
     return debug << "Dual(" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h
index 4f82d4e98..025ff45d9 100644
--- a/src/Magnum/Math/DualComplex.h
+++ b/src/Magnum/Math/DualComplex.h
@@ -403,7 +403,7 @@ template<class T> class DualComplex: public Dual<Complex<T>> {
 
 MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualComplex, Vector2, T)
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{DualComplex} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualComplex<T>& value) {
     return debug << "DualComplex({" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h
index 5da2ed61e..91746d246 100644
--- a/src/Magnum/Math/DualQuaternion.h
+++ b/src/Magnum/Math/DualQuaternion.h
@@ -567,7 +567,7 @@ template<class T> class DualQuaternion: public Dual<Quaternion<T>> {
 
 MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualQuaternion, Quaternion, T)
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{DualQuaternion} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const DualQuaternion<T>& value) {
     return debug << "DualQuaternion({{" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/Frustum.h b/src/Magnum/Math/Frustum.h
index 978fdf28a..7c1e29bef 100644
--- a/src/Magnum/Math/Frustum.h
+++ b/src/Magnum/Math/Frustum.h
@@ -31,7 +31,7 @@
  */
 
 #include <Corrade/configure.h>
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 
@@ -274,7 +274,7 @@ template<class T> class Frustum {
         Vector4<T> _data[6];
 };
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Frustum} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Frustum<T>& value) {
     debug << "Frustum({" << Corrade::Utility::Debug::nospace;
diff --git a/src/Magnum/Math/Half.h b/src/Magnum/Math/Half.h
index 30f3aa8c9..1fd573e5f 100644
--- a/src/Magnum/Math/Half.h
+++ b/src/Magnum/Math/Half.h
@@ -29,7 +29,7 @@
  * @brief Class @ref Magnum::Math::Half, literal @link Magnum::Math::Literals::operator""_h() @endlink
  */
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Utility.h>
 #endif
 
@@ -175,7 +175,7 @@ inline Half operator "" _h(long double value) { return Half(Float(value)); }
 
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /**
 @debugoperator{Half}
 
diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h
index de6521629..ca436e3e4 100644
--- a/src/Magnum/Math/Quaternion.h
+++ b/src/Magnum/Math/Quaternion.h
@@ -30,7 +30,7 @@
  * @brief Class @ref Magnum::Math::Quaternion, function @ref Magnum::Math::dot(), @ref Magnum::Math::halfAngle(), @ref Magnum::Math::lerp(), @ref Magnum::Math::slerp()
  */
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 #include <Corrade/Utility/DebugAssert.h>
@@ -788,7 +788,7 @@ template<class T> inline Quaternion<T> operator/(T scalar, const Quaternion<T>&
     return {scalar/quaternion.vector(), scalar/quaternion.scalar()};
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Quaternion} */
 template<class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Quaternion<T>& value) {
     return debug << "Quaternion({" << Corrade::Utility::Debug::nospace
diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h
index f73f98d01..4be39755c 100644
--- a/src/Magnum/Math/Range.h
+++ b/src/Magnum/Math/Range.h
@@ -790,7 +790,7 @@ template<UnsignedInt dimensions, class T> inline bool intersects(const Range<dim
            (Vector<dimensions, T>{a.min()} < b.max()).all();
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Range} */
 template<UnsignedInt dimensions, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Range<dimensions, T>& value) {
     debug << "Range({" << Corrade::Utility::Debug::nospace << Vector<dimensions, T>{value.min()}[0];
diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h
index 922411ce9..7928dc938 100644
--- a/src/Magnum/Math/RectangularMatrix.h
+++ b/src/Magnum/Math/RectangularMatrix.h
@@ -685,7 +685,7 @@ template<std::size_t size, std::size_t cols, class T> inline RectangularMatrix<c
     return RectangularMatrix<1, size, T>(vector)*matrix;
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{RectangularMatrix} */
 template<std::size_t cols, std::size_t rows, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Magnum::Math::RectangularMatrix<cols, rows, T>& value) {
     /** @todo might make sense to propagate the flags also, for hex value
diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h
index 44cdc8edb..60b29ef80 100644
--- a/src/Magnum/Math/Vector.h
+++ b/src/Magnum/Math/Vector.h
@@ -30,7 +30,7 @@
  */
 
 #include <utility> /* std::pair */
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 #include <Corrade/Utility/Debug.h>
 #endif
 #include <Corrade/Utility/DebugAssert.h>
@@ -1247,7 +1247,7 @@ operator/(const Vector<size, Integral>& a, const Vector<size, FloatingPoint>& b)
     return copy /= b;
 }
 
-#ifndef CORRADE_NO_DEBUG
+#ifndef CORRADE_SINGLES_NO_DEBUG
 /** @debugoperator{Vector} */
 template<std::size_t size, class T> Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& debug, const Vector<size, T>& value) {
     /** @todo might make sense to propagate the flags also, for hex value
diff --git a/src/singles/base.h b/src/singles/base.h
index 7190c639f..067d6bf7d 100644
--- a/src/singles/base.h
+++ b/src/singles/base.h
@@ -41,7 +41,7 @@
 #pragma ACME disable CORRADE_NO_ASSERT
 #pragma ACME disable CORRADE_NO_DEBUG_ASSERT
 #pragma ACME enable CORRADE_STANDARD_ASSERT
-#pragma ACME enable CORRADE_NO_DEBUG
+#pragma ACME enable CORRADE_SINGLES_NO_DEBUG
 #pragma ACME enable CORRADE_NO_TWEAKABLE
 #pragma ACME disable CORRADE_GRACEFUL_ASSERT
 #pragma ACME disable DOXYGEN_GENERATING_OUTPUT