Browse Source

GCC 4.5 compatibility: spoon-feed constructors and assignments.

Vladimír Vondruš 12 years ago
parent
commit
9aa132853b
  1. 11
      src/Magnum/PrimitiveQuery.h
  2. 11
      src/Magnum/SampleQuery.h
  3. 11
      src/Magnum/TimeQuery.h

11
src/Magnum/PrimitiveQuery.h

@ -98,6 +98,17 @@ class PrimitiveQuery: public AbstractQuery {
*/
explicit PrimitiveQuery(Target target): AbstractQuery(GLenum(target)) {}
#ifdef CORRADE_GCC45_COMPATIBILITY
/* GCC 4.5 somehow cannot do this on its own */
PrimitiveQuery(const PrimitiveQuery&) = delete;
PrimitiveQuery(PrimitiveQuery&& other): AbstractQuery(std::move(other)) {}
PrimitiveQuery& operator=(const PrimitiveQuery&) = delete;
PrimitiveQuery& operator=(PrimitiveQuery&& other) {
AbstractQuery::operator=(std::move(other));
return *this;
}
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief AbstractQuery::begin()

11
src/Magnum/SampleQuery.h

@ -192,6 +192,17 @@ class SampleQuery: public AbstractQuery {
*/
explicit SampleQuery(Target target): AbstractQuery(GLenum(target)) {}
#ifdef CORRADE_GCC45_COMPATIBILITY
/* GCC 4.5 somehow cannot do this on its own */
SampleQuery(const SampleQuery&) = delete;
SampleQuery(SampleQuery&& other): AbstractQuery(std::move(other)) {}
SampleQuery& operator=(const SampleQuery&) = delete;
SampleQuery& operator=(SampleQuery&& other) {
AbstractQuery::operator=(std::move(other));
return *this;
}
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief AbstractQuery::begin()

11
src/Magnum/TimeQuery.h

@ -107,6 +107,17 @@ class TimeQuery: public AbstractQuery {
*/
explicit TimeQuery(Target target): AbstractQuery(GLenum(target)) {}
#ifdef CORRADE_GCC45_COMPATIBILITY
/* GCC 4.5 somehow cannot do this on its own */
TimeQuery(const TimeQuery&) = delete;
TimeQuery(TimeQuery&& other): AbstractQuery(std::move(other)) {}
TimeQuery& operator=(const TimeQuery&) = delete;
TimeQuery& operator=(TimeQuery&& other) {
AbstractQuery::operator=(std::move(other));
return *this;
}
#endif
/**
* @brief Query timestamp
*

Loading…
Cancel
Save