Browse Source

MSVC 2013 compatibility: also no non-static data member initializers.

Vladimír Vondruš 11 years ago
parent
commit
d9ad90dcd0
  1. 2
      src/Magnum/Implementation/FramebufferState.cpp
  2. 2
      src/Magnum/Implementation/FramebufferState.h

2
src/Magnum/Implementation/FramebufferState.cpp

@ -33,7 +33,7 @@
namespace Magnum { namespace Implementation { namespace Magnum { namespace Implementation {
#ifndef CORRADE_GCC46_COMPATIBILITY #if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY)
constexpr const Range2Di FramebufferState::DisengagedViewport; constexpr const Range2Di FramebufferState::DisengagedViewport;
#else #else
const Range2Di FramebufferState::DisengagedViewport{{}, {-1, -1}}; const Range2Di FramebufferState::DisengagedViewport{{}, {-1, -1}};

2
src/Magnum/Implementation/FramebufferState.h

@ -43,7 +43,7 @@
namespace Magnum { namespace Implementation { namespace Magnum { namespace Implementation {
struct FramebufferState { struct FramebufferState {
#ifndef CORRADE_GCC46_COMPATIBILITY #if !defined(CORRADE_GCC46_COMPATIBILITY) && !defined(CORRADE_MSVC2013_COMPATIBILITY)
constexpr static const Range2Di DisengagedViewport{{}, {-1, -1}}; constexpr static const Range2Di DisengagedViewport{{}, {-1, -1}};
#else #else
static const Range2Di DisengagedViewport; static const Range2Di DisengagedViewport;

Loading…
Cancel
Save