Browse Source

GCC 4.5 compatibility: cannot use {} here.

Vladimír Vondruš 12 years ago
parent
commit
b0c769cf0e
  1. 5
      src/Magnum/DebugTools/ForceRenderer.cpp
  2. 5
      src/Magnum/DebugTools/ObjectRenderer.cpp

5
src/Magnum/DebugTools/ForceRenderer.cpp

@ -77,8 +77,9 @@ template<UnsignedInt dimensions> ForceRenderer<dimensions>::ForceRenderer(SceneG
if(mesh) return; if(mesh) return;
/* Create the mesh */ /* Create the mesh */
Buffer* vertexBuffer = new Buffer{Buffer::TargetHint::Array}; /* GCC 4.5 cannot handle {} here while we have deprecated Target constructor */
Buffer* indexBuffer = new Buffer{Buffer::TargetHint::ElementArray}; Buffer* vertexBuffer = new Buffer(Buffer::TargetHint::Array);
Buffer* indexBuffer = new Buffer(Buffer::TargetHint::ElementArray);
vertexBuffer->setData(positions, BufferUsage::StaticDraw); vertexBuffer->setData(positions, BufferUsage::StaticDraw);
ResourceManager::instance().set(this->vertexBuffer.key(), vertexBuffer, ResourceDataState::Final, ResourcePolicy::Manual); ResourceManager::instance().set(this->vertexBuffer.key(), vertexBuffer, ResourceDataState::Final, ResourcePolicy::Manual);

5
src/Magnum/DebugTools/ObjectRenderer.cpp

@ -156,8 +156,9 @@ template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(Scen
if(mesh) return; if(mesh) return;
/* Create the mesh */ /* Create the mesh */
Buffer* vertexBuffer = new Buffer{Buffer::TargetHint::Array}; /* GCC 4.5 cannot handle {} here while we have deprecated Target constructor */
Buffer* indexBuffer = new Buffer{Buffer::TargetHint::ElementArray}; Buffer* vertexBuffer = new Buffer(Buffer::TargetHint::Array);
Buffer* indexBuffer = new Buffer(Buffer::TargetHint::ElementArray);
Mesh* mesh = new Mesh; Mesh* mesh = new Mesh;
vertexBuffer->setData(MeshTools::interleave(Renderer<dimensions>::positions, Renderer<dimensions>::colors), BufferUsage::StaticDraw); vertexBuffer->setData(MeshTools::interleave(Renderer<dimensions>::positions, Renderer<dimensions>::colors), BufferUsage::StaticDraw);

Loading…
Cancel
Save