fix compiling on gcc 4.6 (too early to use 4.7.1...)

This commit is contained in:
niczkx
2012-07-30 18:47:21 -06:00
parent 39db801f93
commit 4c369bc823
24 changed files with 53 additions and 52 deletions

View File

@@ -48,7 +48,7 @@ private:
std::string m_text;
Size m_textSize;
bool m_textMustRecache = true;
stdext::boolean<true> m_textMustRecache;
CoordsBuffer m_textCoordsBuffer;
Rect m_textCachedScreenCoords;
BitmapFontPtr m_font;

View File

@@ -61,8 +61,8 @@ private:
Size m_oldViewportSize;
uint m_fbo;
uint m_prevBoundFbo;
bool m_backuping = true;
bool m_smooth = true;
stdext::boolean<true> m_backuping;
stdext::boolean<true> m_smooth;
static uint boundFbo;
};

View File

@@ -77,16 +77,16 @@ private:
int m_maxTextureSize;
int m_alphaBits;
bool m_ok = false;
bool m_useDrawArrays = true;
bool m_useFBO = true;
bool m_useHardwareBuffers = false;
bool m_useBilinearFiltering = true;
bool m_useNonPowerOfTwoTextures = true;
bool m_useMipmaps = true;
bool m_useHardwareMipmaps = true;
bool m_useClampToEdge = true;
bool m_cacheBackbuffer = true;
stdext::boolean<false> m_ok;
stdext::boolean<true> m_useDrawArrays;
stdext::boolean<true> m_useFBO;
stdext::boolean<false> m_useHardwareBuffers;
stdext::boolean<true> m_useBilinearFiltering;
stdext::boolean<true> m_useNonPowerOfTwoTextures;
stdext::boolean<true> m_useMipmaps;
stdext::boolean<true> m_useHardwareMipmaps;
stdext::boolean<true> m_useClampToEdge;
stdext::boolean<true> m_cacheBackbuffer;
PainterEngine m_prefferedPainterEngine;
PainterEngine m_selectedPainterEngine;
};

View File

@@ -72,7 +72,7 @@ private:
void updateGlTextureState();
GLenum m_matrixMode;
bool m_textureEnabled = false;
stdext::boolean<false> m_textureEnabled;
};
extern PainterOGL1 *g_painterOGL1;

View File

@@ -63,10 +63,10 @@ protected:
Size m_size;
Size m_glSize;
Matrix3 m_transformMatrix;
bool m_hasMipmaps = false;
bool m_smooth = false;
bool m_upsideDown = false;
bool m_repeat = false;
stdext::boolean<false> m_hasMipmaps;
stdext::boolean<false> m_smooth;
stdext::boolean<false> m_upsideDown;
stdext::boolean<false> m_repeat;
};
#endif