From dbe4c22645c477f0ab6e77e0541a09f1a8d9e924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 22 Oct 2012 15:35:35 +0200
Subject: [PATCH] Don't use constexpr in AbstractImage subclasses.

AbstractImage has virtual destructor, thus it is not possible to
instantiate it in constant expression.
---
 src/BufferedImage.h   | 2 +-
 src/Image.h           | 4 ++--
 src/ImageWrapper.h    | 4 ++--
 src/Trade/ImageData.h | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/BufferedImage.h b/src/BufferedImage.h
index a09f01964..f950b9636 100644
--- a/src/BufferedImage.h
+++ b/src/BufferedImage.h
@@ -53,7 +53,7 @@ template<std::uint8_t dimensions> class BufferedImage: public AbstractImage {
         }
 
         /** @brief %Image size */
-        inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
+        inline typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
 
         /**
          * @brief Data
diff --git a/src/Image.h b/src/Image.h
index ec7ad719b..8613ebc5c 100644
--- a/src/Image.h
+++ b/src/Image.h
@@ -76,11 +76,11 @@ template<std::uint8_t dimensions> class Image: public AbstractImage {
         inline ~Image() { delete[] _data; }
 
         /** @brief %Image size */
-        inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
+        inline typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
 
         /** @brief Pointer to raw data */
         inline void* data() { return _data; }
-        inline constexpr const void* data() const { return _data; } /**< @overload */
+        inline const void* data() const { return _data; } /**< @overload */
 
         /**
          * @brief Set image data
diff --git a/src/ImageWrapper.h b/src/ImageWrapper.h
index 8b45d9c43..68aabd58f 100644
--- a/src/ImageWrapper.h
+++ b/src/ImageWrapper.h
@@ -80,11 +80,11 @@ template<std::uint8_t dimensions> class ImageWrapper: public AbstractImage {
         inline ImageWrapper(const typename DimensionTraits<Dimensions, GLsizei>::VectorType& size, Components components, ComponentType type): AbstractImage(components, type), _size(size), _data(nullptr) {}
 
         /** @brief %Image size */
-        inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
+        inline typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
 
         /** @brief Pointer to raw data */
         inline void* data() { return _data; }
-        inline constexpr const void* data() const { return _data; } /**< @overload */
+        inline const void* data() const { return _data; } /**< @overload */
 
         /**
          * @brief Set image data
diff --git a/src/Trade/ImageData.h b/src/Trade/ImageData.h
index d225db8bf..cb6ca2690 100644
--- a/src/Trade/ImageData.h
+++ b/src/Trade/ImageData.h
@@ -69,11 +69,11 @@ template<std::uint8_t dimensions> class ImageData: public AbstractImage {
         inline std::string name() const { return _name; }
 
         /** @brief %Image size */
-        inline constexpr typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
+        inline typename DimensionTraits<Dimensions, GLsizei>::VectorType size() const { return _size; }
 
         /** @brief Pointer to raw data */
         inline void* data() { return _data; }
-        inline constexpr const void* data() const { return _data; } /**< @overload */
+        inline const void* data() const { return _data; } /**< @overload */
 
     private:
         std::string _name;