diff --git a/src/Magnum.h b/src/Magnum.h index 242e97ba5..cbc81dd25 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -45,7 +45,7 @@ namespace Math { /** @todoc Remove `ifndef` when Doxygen is able to handle operator"" */ #ifndef DOXYGEN_GENERATING_OUTPUT - #ifndef CORRADE_GCC46_COMPATIBILITY + #if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) #ifndef MAGNUM_TARGET_GLES constexpr Rad operator "" _rad(long double); constexpr Deg operator "" _deg(long double); @@ -502,7 +502,7 @@ typedef Math::Geometry::Rectangle Rectangled; /*@}*/ #endif -#ifndef CORRADE_GCC46_COMPATIBILITY +#if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) /* Using angle literals from Math namespace */ #ifndef MAGNUM_TARGET_GLES using Math::operator "" _deg; diff --git a/src/Math/Angle.h b/src/Math/Angle.h index 1f0b8c150..7f78bee44 100644 --- a/src/Math/Angle.h +++ b/src/Math/Angle.h @@ -146,7 +146,7 @@ template class Deg: public Unit { constexpr /*implicit*/ Deg(Unit value); }; -#ifndef CORRADE_GCC46_COMPATIBILITY +#if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) #ifndef MAGNUM_TARGET_GLES /** @relates Deg @brief Double-precision degree value literal @@ -157,7 +157,7 @@ Double cosine = Math::cos(60.0_deg); // cosine = 0.5 Double cosine = Math::cos(1.047_rad); // cosine = 0.5 @endcode @see Magnum::operator""_deg(), operator""_degf(), operator""_rad() -@note Not available on GCC < 4.7. Use Deg::Deg(T) instead. +@note Not available on GCC < 4.7 and MSVC 2013. Use Deg::Deg(T) instead. @requires_gl Only single-precision types are available in OpenGL ES. */ constexpr Deg operator "" _deg(long double value) { return Deg(value); } @@ -172,7 +172,7 @@ Float tangent = Math::tan(60.0_degf); // tangent = 1.732f Float tangent = Math::tan(1.047_radf); // tangent = 1.732f @endcode @see Magnum::operator""_degf(), operator""_deg(), operator""_radf() -@note Not available on GCC < 4.7. Use Deg::Deg(T) instead. +@note Not available on GCC < 4.7 and MSVC 2013. Use Deg::Deg(T) instead. @requires_gl Only single-precision types are available in OpenGL ES. */ constexpr Deg operator "" _degf(long double value) { return Deg(value); } @@ -209,14 +209,14 @@ template class Rad: public Unit { constexpr /*implicit*/ Rad(Unit value); }; -#ifndef CORRADE_GCC46_COMPATIBILITY +#if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY) #ifndef MAGNUM_TARGET_GLES /** @relates Rad @brief Double-precision radian value literal See operator""_rad() for more information. @see Magnum::operator""_rad(), operator""_radf(), operator""_deg() -@note Not available on GCC < 4.7. Use Rad::Rad(T) instead. +@note Not available on GCC < 4.7 and MSVC 2013. Use Rad::Rad(T) instead. */ constexpr Rad operator "" _rad(long double value) { return Rad(value); } #endif @@ -226,7 +226,7 @@ constexpr Rad operator "" _rad(long double value) { return Rad(v See operator""_degf() for more information. @see Magnum::operator""_radf(), operator""_rad(), operator""_degf() -@note Not available on GCC < 4.7. Use Rad::Rad(T) instead. +@note Not available on GCC < 4.7 and MSVC 2013. Use Rad::Rad(T) instead. */ constexpr Rad operator "" _radf(long double value) { return Rad(value); } #endif