Fix build error introduced in r4250 when not using precompiled headers.

Originally committed to SVN as r4251.
This commit is contained in:
Thomas Goyne 2010-04-30 16:15:12 +00:00
parent c3a986414c
commit 47beda4c89
2 changed files with 3 additions and 0 deletions

View File

@ -42,6 +42,7 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/dcmemory.h> #include <wx/dcmemory.h>
#include <wx/image.h> #include <wx/image.h>
#include <algorithm>
#endif #endif
#include "gl_text.h" #include "gl_text.h"
@ -283,6 +284,7 @@ OpenGLTextGlyph OpenGLText::CreateGlyph(int n) {
/// @param h /// @param h
/// ///
OpenGLTextTexture::OpenGLTextTexture(int w,int h) { OpenGLTextTexture::OpenGLTextTexture(int w,int h) {
using std::max;
// Properties // Properties
x = y = nextY = 0; x = y = nextY = 0;
width = max(SmallestPowerOf2(w), 64); width = max(SmallestPowerOf2(w), 64);

View File

@ -39,6 +39,7 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <wx/log.h> #include <wx/log.h>
#include <algorithm> #include <algorithm>
#include <utility>
#endif #endif
using std::min; using std::min;