diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index 457454677..48152dece 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -60,8 +60,7 @@ template<> struct Renderer<3> { } -/* MSVC 2015 can't handle {} here */ -template ObjectRenderer::ObjectRenderer(SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable(object, drawables), _options{ResourceManager::instance().get(options)} { +template ObjectRenderer::ObjectRenderer(SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable{object, drawables}, _options{ResourceManager::instance().get(options)} { /* Shader */ _shader = ResourceManager::instance().get>(Renderer::shader()); if(!_shader) ResourceManager::instance().set(_shader.key(), new Shaders::VertexColor); diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 87661df9b..f7391e088 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -126,12 +126,20 @@ std::sin(Float(Rad(b)); // required explicit conversion hints to user template class Deg: public Unit { public: /** @brief Construct zero angle */ - /* MSVC 2015 can't handle {} here */ - constexpr /*implicit*/ Deg(ZeroInitT = ZeroInit) noexcept: Unit(ZeroInit) {} + constexpr /*implicit*/ Deg(ZeroInitT = ZeroInit) noexcept + /** @todoc remove workaround when doxygen is sane */ + #ifndef DOXYGEN_GENERATING_OUTPUT + : Unit{ZeroInit} + #endif + {} /** @brief Construct without initializing the contents */ - /* MSVC 2015 can't handle {} here */ - explicit Deg(NoInitT) noexcept: Unit(NoInit) {} + explicit Deg(NoInitT) noexcept + /** @todoc remove workaround when doxygen is sane */ + #ifndef DOXYGEN_GENERATING_OUTPUT + : Unit{NoInit} + #endif + {} /** @brief Explicit constructor from unitless type */ constexpr explicit Deg(T value) noexcept: Unit(value) {} @@ -190,12 +198,20 @@ See @ref Deg for more information. template class Rad: public Unit { public: /** @brief Default constructor */ - /* MSVC 2015 can't handle {} here */ - constexpr /*implicit*/ Rad(ZeroInitT = ZeroInit) noexcept: Unit(ZeroInit) {} + constexpr /*implicit*/ Rad(ZeroInitT = ZeroInit) noexcept + /** @todoc remove workaround when doxygen is sane */ + #ifndef DOXYGEN_GENERATING_OUTPUT + : Unit{ZeroInit} + #endif + {} /** @brief Construct without initializing the contents */ - /* MSVC 2015 can't handle {} here */ - explicit Rad(NoInitT) noexcept: Unit(NoInit) {} + explicit Rad(NoInitT) noexcept + /** @todoc remove workaround when doxygen is sane */ + #ifndef DOXYGEN_GENERATING_OUTPUT + : Unit{NoInit} + #endif + {} /** @brief Construct from unitless type */ constexpr explicit Rad(T value) noexcept: Unit(value) {} diff --git a/src/Magnum/Math/Bezier.h b/src/Magnum/Math/Bezier.h index ab8be57e6..92cd609a4 100644 --- a/src/Magnum/Math/Bezier.h +++ b/src/Magnum/Math/Bezier.h @@ -72,8 +72,7 @@ template class Bezier { constexpr /*implicit*/ Bezier(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Bezier(typename Implementation::GenerateSequence::Type{}, ZeroInit) + : Bezier{typename Implementation::GenerateSequence::Type{}, ZeroInit} #endif {} @@ -81,8 +80,7 @@ template class Bezier { explicit Bezier(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Bezier(typename Implementation::GenerateSequence::Type{}, NoInit) + : Bezier{typename Implementation::GenerateSequence::Type{}, NoInit} #endif {} diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h index 2feec3fb3..d653c6e58 100644 --- a/src/Magnum/Math/Color.h +++ b/src/Magnum/Math/Color.h @@ -420,8 +420,7 @@ template class Color3: public Vector3 { constexpr /*implicit*/ Color3(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector3(ZeroInit) + : Vector3{ZeroInit} #endif {} @@ -429,8 +428,7 @@ template class Color3: public Vector3 { explicit Color3(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector3(NoInit) + : Vector3{NoInit} #endif {} @@ -803,8 +801,7 @@ class Color4: public Vector4 { constexpr explicit Color4(ZeroInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector4(ZeroInit) + : Vector4{ZeroInit} #endif {} @@ -812,8 +809,7 @@ class Color4: public Vector4 { explicit Color4(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector4(NoInit) + : Vector4{NoInit} #endif {} diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h index ad13a5095..2936918d5 100644 --- a/src/Magnum/Math/DualComplex.h +++ b/src/Magnum/Math/DualComplex.h @@ -113,8 +113,7 @@ template class DualComplex: public Dual> { constexpr explicit DualComplex(ZeroInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>(Complex{ZeroInit}, Complex{ZeroInit}) + : Dual>{Complex{ZeroInit}, Complex{ZeroInit}} #endif {} @@ -122,8 +121,7 @@ template class DualComplex: public Dual> { explicit DualComplex(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>(NoInit) + : Dual>{NoInit} #endif {} @@ -159,9 +157,9 @@ template class DualComplex: public Dual> { * else. */ template constexpr explicit DualComplex(const DualComplex& other) noexcept + /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>(other) + : Dual>{other} #endif {} diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index d938f8b0e..279157092 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -167,7 +167,7 @@ template class DualQuaternion: public Dual> { constexpr /*implicit*/ DualQuaternion(IdentityInitT = IdentityInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>({}, {{}, T(0)}) + : Dual>{{}, {{}, T(0)}} #endif {} @@ -175,8 +175,7 @@ template class DualQuaternion: public Dual> { constexpr explicit DualQuaternion(ZeroInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>(Quaternion{ZeroInit}, Quaternion{ZeroInit}) + : Dual>{Quaternion{ZeroInit}, Quaternion{ZeroInit}} #endif {} @@ -184,8 +183,7 @@ template class DualQuaternion: public Dual> { explicit DualQuaternion(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>(NoInit) + : Dual>{NoInit} #endif {} @@ -207,8 +205,7 @@ template class DualQuaternion: public Dual> { */ constexpr /*implicit*/ DualQuaternion(const Dual>& vector, const Dual& scalar) noexcept #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Dual>({vector.real(), scalar.real()}, {vector.dual(), scalar.dual()}) + : Dual>{{vector.real(), scalar.real()}, {vector.dual(), scalar.dual()}} #endif {} diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index 7798ba55d..2b977d2a8 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -86,8 +86,7 @@ template class Matrix: public RectangularMatrix(typename Implementation::GenerateSequence::Type(), Vector(value)) + : RectangularMatrix{typename Implementation::GenerateSequence::Type(), Vector(value)} #endif {} @@ -95,8 +94,7 @@ template class Matrix: public RectangularMatrix(ZeroInit) + : RectangularMatrix{ZeroInit} #endif {} @@ -104,8 +102,7 @@ template class Matrix: public RectangularMatrix(NoInit) + : RectangularMatrix{NoInit} #endif {} diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index d391e24b3..2d918ce19 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -204,8 +204,7 @@ template class Matrix3: public Matrix3x3 { constexpr /*implicit*/ Matrix3(IdentityInitT = IdentityInit, T value = T{1}) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix3x3(IdentityInit, value) + : Matrix3x3{IdentityInit, value} #endif {} @@ -213,8 +212,7 @@ template class Matrix3: public Matrix3x3 { constexpr explicit Matrix3(ZeroInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix3x3(ZeroInit) + : Matrix3x3{ZeroInit} #endif {} @@ -222,8 +220,7 @@ template class Matrix3: public Matrix3x3 { constexpr explicit Matrix3(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix3x3(NoInit) + : Matrix3x3{NoInit} #endif {} diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 0e43059fd..1afc60cfc 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -375,8 +375,7 @@ template class Matrix4: public Matrix4x4 { constexpr /*implicit*/ Matrix4(IdentityInitT = IdentityInit, T value = T{1}) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix4x4(IdentityInit, value) + : Matrix4x4{IdentityInit, value} #endif {} @@ -384,8 +383,7 @@ template class Matrix4: public Matrix4x4 { constexpr explicit Matrix4(ZeroInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix4x4(ZeroInit) + : Matrix4x4{ZeroInit} #endif {} @@ -393,8 +391,7 @@ template class Matrix4: public Matrix4x4 { constexpr explicit Matrix4(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Matrix4x4(NoInit) + : Matrix4x4{NoInit} #endif {} diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index 67f8e54ed..f6c0928b5 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -234,8 +234,7 @@ template class Range2D: public Range<2, T> { constexpr /*implicit*/ Range2D(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<2, T>(ZeroInit) + : Range<2, T>{ZeroInit} #endif {} @@ -243,8 +242,7 @@ template class Range2D: public Range<2, T> { explicit Range2D(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<2, T>(NoInit) + : Range<2, T>{NoInit} #endif {} @@ -266,9 +264,9 @@ template class Range2D: public Range<2, T> { #endif > constexpr explicit Range2D(const U& other) + /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<2, T>(Implementation::RangeConverter<2, T, U>::from(other)) + : Range<2, T>{Implementation::RangeConverter<2, T, U>::from(other)} #endif {} @@ -368,8 +366,7 @@ template class Range3D: public Range<3, T> { constexpr /*implicit*/ Range3D(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<3, T>(ZeroInit) + : Range<3, T>{ZeroInit} #endif {} @@ -377,8 +374,7 @@ template class Range3D: public Range<3, T> { explicit Range3D(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<3, T>(NoInit) + : Range<3, T>{NoInit} #endif {} @@ -393,9 +389,9 @@ template class Range3D: public Range<3, T> { * @todoc Remove workaround when Doxygen no longer chokes on that line */ template::from(std::declval()))> constexpr explicit Range3D(const U& other) noexcept + /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Range<3, T>(Implementation::RangeConverter<3, T, U>::from(other)) + : Range<3, T>{Implementation::RangeConverter<3, T, U>::from(other)} #endif {} diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index c44acd3cd..c7754ff2d 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -111,8 +111,7 @@ template class RectangularMatrix { constexpr /*implicit*/ RectangularMatrix(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : RectangularMatrix(typename Implementation::GenerateSequence::Type{}, ZeroInit) + : RectangularMatrix{typename Implementation::GenerateSequence::Type{}, ZeroInit} #endif {} @@ -120,8 +119,7 @@ template class RectangularMatrix { explicit RectangularMatrix(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : RectangularMatrix(typename Implementation::GenerateSequence::Type{}, NoInit) + : RectangularMatrix{typename Implementation::GenerateSequence::Type{}, NoInit} #endif {} diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index 4b90e1b8d..cf98e5939 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -262,8 +262,7 @@ namespace { template class BasicDualVec2: public Math::Dual> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicDualVec2(U&&... args): Math::Dual>(args...) {} + template constexpr BasicDualVec2(U&&... args): Math::Dual>{args...} {} MAGNUM_DUAL_SUBCLASS_IMPLEMENTATION(BasicDualVec2, Math::Vector2, T) MAGNUM_DUAL_SUBCLASS_MULTIPLICATION_IMPLEMENTATION(BasicDualVec2, Math::Vector2) diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index 25f8f473d..398a2d098 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -350,14 +350,12 @@ void MatrixTest::invertedOrthogonal() { template class BasicVec2: public Math::Vector<2, T> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicVec2(U&&... args): Math::Vector<2, T>(args...) {} + template constexpr BasicVec2(U&&... args): Math::Vector<2, T>{args...} {} }; template class BasicMat2: public Math::Matrix<2, T> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicMat2(U&&... args): Math::Matrix<2, T>(args...) {} + template constexpr BasicMat2(U&&... args): Math::Matrix<2, T>{args...} {} MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(2, BasicMat2, BasicVec2) }; diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 1c0c0e945..231d9daf6 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -488,8 +488,7 @@ void RangeTest::join() { template class BasicRect: public Math::Range<2, T> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicRect(U&&... args): Math::Range<2, T>(args...) {} + template constexpr BasicRect(U&&... args): Math::Range<2, T>{args...} {} MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(2, BasicRect, Vector2) }; diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index 8d69bd59b..c2c02b968 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -544,8 +544,7 @@ void RectangularMatrixTest::vector() { template class BasicMat: public Math::RectangularMatrix { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicMat(U&&... args): Math::RectangularMatrix(args...) {} + template constexpr BasicMat(U&&... args): Math::RectangularMatrix{args...} {} MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, BasicMat) }; @@ -554,8 +553,7 @@ MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(BasicMat) template class BasicMat2x2: public BasicMat<2, T> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicMat2x2(U&&... args): BasicMat<2, T>(args...) {} + template constexpr BasicMat2x2(U&&... args): BasicMat<2, T>{args...} {} MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(2, 2, BasicMat2x2) }; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 5adbd4383..6c6cd643c 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -517,8 +517,7 @@ void VectorTest::angle() { template class BasicVec2: public Math::Vector<2, T> { public: - /* MSVC 2015 can't handle {} here */ - template constexpr BasicVec2(U&&... args): Math::Vector<2, T>(args...) {} + template constexpr BasicVec2(U&&... args): Math::Vector<2, T>{args...} {} MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, BasicVec2) }; diff --git a/src/Magnum/Math/Vector2.h b/src/Magnum/Math/Vector2.h index 4987747cb..ef05e9741 100644 --- a/src/Magnum/Math/Vector2.h +++ b/src/Magnum/Math/Vector2.h @@ -115,8 +115,7 @@ template class Vector2: public Vector<2, T> { constexpr /*implicit*/ Vector2(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<2, T>(ZeroInit) + : Vector<2, T>{ZeroInit} #endif {} @@ -124,8 +123,7 @@ template class Vector2: public Vector<2, T> { explicit Vector2(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<2, T>(NoInit) + : Vector<2, T>{NoInit} #endif {} diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index 10f989ee7..1304d00d3 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -137,8 +137,7 @@ template class Vector3: public Vector<3, T> { constexpr /*implicit*/ Vector3(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<3, T>(ZeroInit) + : Vector<3, T>{ZeroInit} #endif {} @@ -146,8 +145,7 @@ template class Vector3: public Vector<3, T> { explicit Vector3(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<3, T>(NoInit) + : Vector<3, T>{NoInit} #endif {} diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index 6aab6f475..64cbab075 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -63,8 +63,7 @@ template class Vector4: public Vector<4, T> { constexpr /*implicit*/ Vector4(ZeroInitT = ZeroInit) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<4, T>(ZeroInit) + : Vector<4, T>{ZeroInit} #endif {} @@ -72,8 +71,7 @@ template class Vector4: public Vector<4, T> { explicit Vector4(NoInitT) noexcept /** @todoc remove workaround when doxygen is sane */ #ifndef DOXYGEN_GENERATING_OUTPUT - /* MSVC 2015 can't handle {} here */ - : Vector<4, T>(NoInit) + : Vector<4, T>{NoInit} #endif {} diff --git a/src/Magnum/SceneGraph/Camera.h b/src/Magnum/SceneGraph/Camera.h index 857f7ce40..83bdd2637 100644 --- a/src/Magnum/SceneGraph/Camera.h +++ b/src/Magnum/SceneGraph/Camera.h @@ -106,8 +106,7 @@ template class Camera: public AbstractFeature, U>::value>::type> Camera(U& object): Camera(static_cast&>(object)) {} + template, U>::value>::type> Camera(U& object): Camera{static_cast&>(object)} {} #endif ~Camera();