From 6af144f3d01eb2c61952bbb27520f3c494763590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 1 Oct 2014 00:44:58 +0200 Subject: [PATCH] GCC 4.6 compatibility: no delegating constructors. --- src/Magnum/Buffer.cpp | 11 +++++++++++ src/Magnum/Buffer.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp index c992b72b4..fa9b69b5a 100644 --- a/src/Magnum/Buffer.cpp +++ b/src/Magnum/Buffer.cpp @@ -171,6 +171,17 @@ Buffer::Buffer(const TargetHint targetHint): _targetHint{targetHint} CORRADE_INTERNAL_ASSERT(_id != Implementation::State::DisengagedBinding); } +#ifdef MAGNUM_BUILD_DEPRECATED +Buffer::Buffer(const Target targetHint): _targetHint{static_cast(targetHint)} + #ifdef CORRADE_TARGET_NACL + , _mappedBuffer{nullptr} + #endif +{ + (this->*Context::current()->state().buffer->createImplementation)(); + CORRADE_INTERNAL_ASSERT(_id != Implementation::State::DisengagedBinding); +} +#endif + void Buffer::createImplementationDefault() { glGenBuffers(1, &_id); _created = false; diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index ed222b9e0..a02a75fce 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -774,7 +774,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { * @deprecated Use @ref Magnum::Buffer::Buffer(Magnum::Buffer::TargetHint) "Buffer(TargetHint)" * instead. */ - CORRADE_DEPRECATED("use Buffer(TargetHint) instead") explicit Buffer(Target targetHint): Buffer{static_cast(targetHint)} {} + CORRADE_DEPRECATED("use Buffer(TargetHint) instead") explicit Buffer(Target targetHint); #endif /** @brief Copying is not allowed */