From 7eb520f77a2c60b79c50aadc41fe888bd71a06f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 19 Apr 2025 11:13:48 +0200 Subject: [PATCH] Underscore private MAGNUM_* macros to not leak into autocompletion. The MAGNUM_GL_ABSTRACTSHADERPROGRAM_SUBCLASS_DRAW_IMPLEMENTATION() and MAGNUM_GL_ABSTRACTSHADERPROGRAM_SUBCLASS_DISPATCH_IMPLEMENTATION() *is* documented so that one stays not underscored. --- src/Magnum/GL/Context.h | 2 +- src/Magnum/Math/Color.h | 8 ++++---- src/Magnum/Math/Dual.h | 6 +++--- src/Magnum/Math/DualComplex.h | 6 +++--- src/Magnum/Math/DualQuaternion.h | 6 +++--- src/Magnum/Math/Matrix.h | 6 +++--- src/Magnum/Math/Matrix3.h | 6 +++--- src/Magnum/Math/Matrix4.h | 6 +++--- src/Magnum/Math/Range.h | 6 +++--- src/Magnum/Math/RectangularMatrix.h | 6 +++--- src/Magnum/Math/Test/DualTest.cpp | 6 +++--- src/Magnum/Math/Test/MatrixTest.cpp | 2 +- src/Magnum/Math/Test/RangeTest.cpp | 2 +- src/Magnum/Math/Test/RectangularMatrixTest.cpp | 8 ++++---- src/Magnum/Math/Test/VectorTest.cpp | 4 ++-- src/Magnum/Math/Vector.h | 4 ++-- src/Magnum/Math/Vector2.h | 4 ++-- src/Magnum/Math/Vector3.h | 4 ++-- src/Magnum/Math/Vector4.h | 4 ++-- src/Magnum/Platform/AbstractXApplication.h | 2 +- src/Magnum/Platform/AndroidApplication.h | 2 +- src/Magnum/Platform/EmscriptenApplication.h | 2 +- src/Magnum/Platform/GlfwApplication.h | 2 +- src/Magnum/Platform/Sdl2Application.h | 2 +- src/Magnum/Platform/WindowlessCglApplication.h | 2 +- src/Magnum/Platform/WindowlessEglApplication.h | 2 +- src/Magnum/Platform/WindowlessGlxApplication.h | 2 +- src/Magnum/Platform/WindowlessIosApplication.h | 2 +- src/Magnum/Platform/WindowlessWglApplication.h | 2 +- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/Magnum/GL/Context.h b/src/Magnum/GL/Context.h index 5f7f95104..45282d265 100644 --- a/src/Magnum/GL/Context.h +++ b/src/Magnum/GL/Context.h @@ -1159,7 +1159,7 @@ class MAGNUM_GL_EXPORT Context::Configuration { }; #ifndef DOXYGEN_GENERATING_OUTPUT -#define MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Type) \ +#define _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Type) \ Type& addDisabledWorkarounds(const Containers::StringIterable& workarounds) { \ GL::Context::Configuration::addDisabledWorkarounds(workarounds); \ return *this; \ diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h index 083948f67..f6a0edea7 100644 --- a/src/Magnum/Math/Color.h +++ b/src/Magnum/Math/Color.h @@ -764,11 +764,11 @@ template class Color3: public Vector3 { return Implementation::toXyz(*this); } - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(3, Color3) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(3, Color3) }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, Color3) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, Color3) #endif /** @@ -1292,11 +1292,11 @@ class Color4: public Vector4 { constexpr const Color3 rgb() const { return xyz(); } #endif - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(4, Color4) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(4, Color4) }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(4, Color4) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(4, Color4) #endif /** @relatesalso Color3 diff --git a/src/Magnum/Math/Dual.h b/src/Magnum/Math/Dual.h index 5ba1c2d40..f660c4d5d 100644 --- a/src/Magnum/Math/Dual.h +++ b/src/Magnum/Math/Dual.h @@ -344,7 +344,7 @@ template operator+() const { \ return Math::Dual>::operator+(); \ } \ @@ -379,7 +379,7 @@ template Type operator*(const Math::Dual& other) const { \ return Math::Dual>::operator*(other); \ } \ @@ -393,7 +393,7 @@ template>::operator/(other); \ } -#define MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(Type, Underlying, Multiplicable) \ +#define _MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(Type, Underlying, Multiplicable) \ template inline Type operator*(const Math::Dual& a, const Type& b) { \ return a*static_cast>&>(b); \ } \ diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h index a0a7558e7..6c6d06750 100644 --- a/src/Magnum/Math/DualComplex.h +++ b/src/Magnum/Math/DualComplex.h @@ -401,12 +401,12 @@ template class DualComplex: public Dual> { return Vector2(((*this)*DualComplex(vector)).dual()); } - MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(DualComplex, Vector2, T) - /* Not using MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(), as + _MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(DualComplex, Vector2, T) + /* Not using _MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(), as we have special multiplication/division implementation */ }; -MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualComplex, Vector2, T) +_MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualComplex, Vector2, T) #ifndef CORRADE_SINGLES_NO_DEBUG /** @debugoperator{DualComplex} */ diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index 79d674dab..c7c4403d1 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -565,11 +565,11 @@ template class DualQuaternion: public Dual> { return ((*this)*DualQuaternion(vector)*conjugated()).dual().vector(); } - MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(DualQuaternion, Quaternion, T) - MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(DualQuaternion, Quaternion) + _MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(DualQuaternion, Quaternion, T) + _MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(DualQuaternion, Quaternion) }; -MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualQuaternion, Quaternion, T) +_MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(DualQuaternion, Quaternion, T) #ifndef CORRADE_SINGLES_NO_DEBUG /** @debugoperator{DualQuaternion} */ diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index ed4050e45..83d723d6f 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -307,7 +307,7 @@ template class Matrix: public RectangularMatrix transposed() const { return RectangularMatrix::transposed(); } - MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, Matrix) + _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, Matrix) #endif private: @@ -352,10 +352,10 @@ additional functions for transformations in 3D. template using Matrix4x4 = Matrix<4, T>; #endif -MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(Matrix) +_MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(Matrix) #ifndef DOXYGEN_GENERATING_OUTPUT -#define MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(size, Type, VectorType) \ +#define _MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(size, Type, VectorType) \ VectorType& operator[](std::size_t col) { \ return static_cast&>(Matrix::operator[](col)); \ } \ diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index a1988902d..8c46b643d 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -747,12 +747,12 @@ template class Matrix3: public Matrix3x3 { return ((*this)*Vector3(vector, T(1))).xy(); } - MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(3, 3, Matrix3) - MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(3, Matrix3, Vector3) + _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(3, 3, Matrix3) + _MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(3, Matrix3, Vector3) }; #ifndef DOXYGEN_GENERATING_OUTPUT -MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(3, Matrix3) +_MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(3, Matrix3) #endif template Matrix3 Matrix3::rotation(const Rad angle) { diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 6647ab72f..8dfcecda4 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -1192,12 +1192,12 @@ template class Matrix4: public Matrix4x4 { return transformed.xyz()/transformed.w(); } - MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(4, 4, Matrix4) - MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(4, Matrix4, Vector4) + _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(4, 4, Matrix4) + _MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(4, Matrix4, Vector4) }; #ifndef DOXYGEN_GENERATING_OUTPUT -MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(4, Matrix4) +_MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(4, Matrix4) #endif template Matrix4 Matrix4::rotation(const Rad angle, const Vector3& normalizedAxis) { diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index 80a03d10a..4afe39673 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -395,7 +395,7 @@ template class Range { }; #ifndef DOXYGEN_GENERATING_OUTPUT -#define MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(dimensions, Type, VectorType) \ +#define _MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(dimensions, Type, VectorType) \ static Type fromSize(const VectorType& min, const VectorType& size) { \ return Range::fromSize(min, size); \ } \ @@ -581,7 +581,7 @@ template class Range2D: public Range<2, T> { return (Range<2, T>::min().y() + Range<2, T>::max().y())/T(2); } - MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(2, Range2D, Vector2) + _MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(2, Range2D, Vector2) }; /** @@ -780,7 +780,7 @@ template class Range3D: public Range<3, T> { return (Range<3, T>::min().z() + Range<3, T>::max().z())/T(2); } - MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(3, Range3D, Vector3) + _MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(3, Range3D, Vector3) }; /** @relatesalso Range diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 166523342..31d555d3c 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -811,7 +811,7 @@ extern template MAGNUM_EXPORT Debug& operator<<(Debug&, const RectangularMatrix< #endif #ifndef DOXYGEN_GENERATING_OUTPUT -#define MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(cols, rows, ...) \ +#define _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(cols, rows, ...) \ static __VA_ARGS__& from(T* data) { \ return *reinterpret_cast<__VA_ARGS__*>(data); \ } \ @@ -866,7 +866,7 @@ extern template MAGNUM_EXPORT Debug& operator<<(Debug&, const RectangularMatrix< /* Unlike with Vector, these are kept non-member and non-friend as it'd mean too many macro combinations otherwise */ -#define MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(...) \ +#define _MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(...) \ template inline __VA_ARGS__ operator*(typename std::common_type::type number, const __VA_ARGS__& matrix) { \ return number*static_cast&>(matrix); \ } \ @@ -877,7 +877,7 @@ extern template MAGNUM_EXPORT Debug& operator<<(Debug&, const RectangularMatrix< return Math::RectangularMatrix<1, size, T>(vector)*matrix; \ } -#define MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(size, Type) \ +#define _MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(size, Type) \ template inline Type operator*(typename std::common_type::type number, const Type& matrix) { \ return number*static_cast&>(matrix); \ } \ diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index 650b84f11..1c8e0ef09 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -323,11 +323,11 @@ template class BasicDualVec2: public Math::Dual> { public: template constexpr BasicDualVec2(U&&... args): Math::Dual>{args...} {} - MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(BasicDualVec2, Math::Vector2, T) - MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(BasicDualVec2, Math::Vector2) + _MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(BasicDualVec2, Math::Vector2, T) + _MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(BasicDualVec2, Math::Vector2) }; -MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(BasicDualVec2, Math::Vector2, T) +_MAGNUM_DUAL_OPERATOR_IMPLEMENTATION(BasicDualVec2, Math::Vector2, T) typedef BasicDualVec2 DualVec2; diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index 197baec73..26abd8a15 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -575,7 +575,7 @@ template class BasicMat2: public Math::Matrix<2, T> { public: template constexpr BasicMat2(U&&... args): Math::Matrix<2, T>{args...} {} - MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(2, BasicMat2, BasicVec2) + _MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(2, BasicMat2, BasicVec2) }; typedef BasicVec2 Vec2; diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 8fdb1eede..58ab9087e 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -968,7 +968,7 @@ template class BasicRect: public Math::Range<2, T> { public: template constexpr BasicRect(U&&... args): Math::Range<2, T>{args...} {} - MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(2, BasicRect, Vector2) + _MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(2, BasicRect, Vector2) }; typedef BasicRect Recti; diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index 5d8d3ab01..288410380 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -815,19 +815,19 @@ template class BasicMat: public Math::RectangularMatr public: template constexpr BasicMat(U&&... args): Math::RectangularMatrix{args...} {} - MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, BasicMat) + _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, BasicMat) }; -MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(BasicMat) +_MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(BasicMat) template class BasicMat2x2: public BasicMat<2, T> { public: template constexpr BasicMat2x2(U&&... args): BasicMat<2, T>{args...} {} - MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(2, 2, BasicMat2x2) + _MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(2, 2, BasicMat2x2) }; -MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(2, BasicMat2x2) +_MAGNUM_MATRIXn_OPERATOR_IMPLEMENTATION(2, BasicMat2x2) typedef BasicMat2x2 Mat2x2; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index cc0636310..b325eba59 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -896,11 +896,11 @@ template class BasicVec2: public Math::Vector<2, T> { public: template constexpr BasicVec2(U&&... args): Math::Vector<2, T>{args...} {} - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, BasicVec2) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, BasicVec2) }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(2, BasicVec2) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(2, BasicVec2) #endif typedef BasicVec2 Vec2; diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 2b74d0650..400acf612 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -1341,7 +1341,7 @@ extern template MAGNUM_EXPORT Debug& operator<<(Debug&, const Vector<4, Double>& #endif #ifndef DOXYGEN_GENERATING_OUTPUT -#define MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(size, Type_) \ +#define _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(size, Type_) \ static Type_& from(T* data) { \ return *reinterpret_cast*>(data); \ } \ @@ -1530,7 +1530,7 @@ template::value && std::is_floating_point::value, int>::type = 0> constexpr Type operator*(FloatingPoint scalar, const Type& vector) { \ return vector*scalar; \ } diff --git a/src/Magnum/Math/Vector2.h b/src/Magnum/Math/Vector2.h index 78285dd38..91e622533 100644 --- a/src/Magnum/Math/Vector2.h +++ b/src/Magnum/Math/Vector2.h @@ -238,14 +238,14 @@ template class Vector2: public Vector<2, T> { #endif T aspectRatio() const { return x()/y(); } - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, Vector2) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, Vector2) private: template friend U cross(const Vector2&, const Vector2&); }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(2, Vector2) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(2, Vector2) #endif namespace Implementation { diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index 36be197e6..b3c547eeb 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -276,14 +276,14 @@ template class Vector3: public Vector<3, T> { return {Vector<3, T>::_data[0], Vector<3, T>::_data[1]}; } - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(3, Vector3) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(3, Vector3) private: template friend Vector3 cross(const Vector3&, const Vector3&); }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, Vector3) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(3, Vector3) #endif #ifndef MAGNUM_NO_MATH_STRICT_WEAK_ORDERING diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index 4b771ec98..0884e7705 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -258,11 +258,11 @@ template class Vector4: public Vector<4, T> { return {Vector<4, T>::_data[0], Vector<4, T>::_data[1]}; } - MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(4, Vector4) + _MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(4, Vector4) }; #ifdef CORRADE_MSVC2015_COMPATIBILITY -MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(4, Vector4) +_MAGNUM_VECTORn_OPERATOR_IMPLEMENTATION(4, Vector4) #endif /** @relatesalso Vector4 diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index b91dbdeef..131d04bd7 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -1019,7 +1019,7 @@ class AbstractXApplication::GLConfiguration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) #endif private: diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 5ba754bd2..d2a7aa3e6 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -851,7 +851,7 @@ class AndroidApplication::GLConfiguration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) #endif private: diff --git a/src/Magnum/Platform/EmscriptenApplication.h b/src/Magnum/Platform/EmscriptenApplication.h index e7e4a9813..8f55bea08 100644 --- a/src/Magnum/Platform/EmscriptenApplication.h +++ b/src/Magnum/Platform/EmscriptenApplication.h @@ -1724,7 +1724,7 @@ class EmscriptenApplication::GLConfiguration: public GL::Context::Configuration /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) #endif private: diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index 9b3c15c93..24341b54d 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -1602,7 +1602,7 @@ class GlfwApplication::GLConfiguration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) #endif private: diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index b2a0a50c1..f11123f90 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -2235,7 +2235,7 @@ class Sdl2Application::GLConfiguration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(GLConfiguration) #endif private: diff --git a/src/Magnum/Platform/WindowlessCglApplication.h b/src/Magnum/Platform/WindowlessCglApplication.h index d3d953652..97bbe3401 100644 --- a/src/Magnum/Platform/WindowlessCglApplication.h +++ b/src/Magnum/Platform/WindowlessCglApplication.h @@ -277,7 +277,7 @@ class WindowlessCglContext::Configuration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) #endif private: diff --git a/src/Magnum/Platform/WindowlessEglApplication.h b/src/Magnum/Platform/WindowlessEglApplication.h index e66e752a1..24882f049 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.h +++ b/src/Magnum/Platform/WindowlessEglApplication.h @@ -408,7 +408,7 @@ class WindowlessEglContext::Configuration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) #endif private: diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index b6d3cdc71..4617a614c 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -331,7 +331,7 @@ class WindowlessGlxContext::Configuration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) #endif private: diff --git a/src/Magnum/Platform/WindowlessIosApplication.h b/src/Magnum/Platform/WindowlessIosApplication.h index 76dd52d98..7c562a6b4 100644 --- a/src/Magnum/Platform/WindowlessIosApplication.h +++ b/src/Magnum/Platform/WindowlessIosApplication.h @@ -244,7 +244,7 @@ class WindowlessIosContext::Configuration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) #endif }; diff --git a/src/Magnum/Platform/WindowlessWglApplication.h b/src/Magnum/Platform/WindowlessWglApplication.h index 9d68889c7..a6cbf1f52 100644 --- a/src/Magnum/Platform/WindowlessWglApplication.h +++ b/src/Magnum/Platform/WindowlessWglApplication.h @@ -318,7 +318,7 @@ class WindowlessWglContext::Configuration: public GL::Context::Configuration { /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT - MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) + _MAGNUM_GL_CONTEXT_CONFIGURATION_SUBCLASS_IMPLEMENTATION(Configuration) #endif private: