gcc 4.5 compilation fixes
Originally committed to SVN as r4797.
This commit is contained in:
parent
1fbe7b4f1e
commit
b4739d2aee
3 changed files with 3 additions and 3 deletions
|
@ -39,7 +39,7 @@
|
|||
|
||||
// These macros below aren't a perm solution, it will depend on how annoying they are through
|
||||
// actual usage, and also depends on msvc support.
|
||||
#define LOG_SINK(section, severity) agi::log::Message::Message(section, severity, __FILE__, __FUNCTION__, __LINE__).stream()
|
||||
#define LOG_SINK(section, severity) agi::log::Message(section, severity, __FILE__, __FUNCTION__, __LINE__).stream()
|
||||
#define LOG_E(section) LOG_SINK(section, agi::log::Exception)
|
||||
#define LOG_A(section) LOG_SINK(section, agi::log::Assert)
|
||||
#define LOG_W(section) LOG_SINK(section, agi::log::Warning)
|
||||
|
|
|
@ -65,7 +65,7 @@ typedef GLuint GLhandleARB;
|
|||
#define GL_EXT(type, name) \
|
||||
static type name = reinterpret_cast<type>(glGetProc(#name)); \
|
||||
if (!name) { \
|
||||
name = & name ## Fallback; \
|
||||
name = reinterpret_cast<type>(& name ## Fallback); \
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ void VisualToolVectorClip::SetMode(int newMode) {
|
|||
// Substitute for glMultiDrawArrays for sub-1.4 OpenGL
|
||||
// Not required on OS X.
|
||||
#ifndef __APPLE__
|
||||
static void APIENTRY glMultiDrawArraysFallback(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount) {
|
||||
static void APIENTRY glMultiDrawArraysFallback(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount) {
|
||||
for (int i = 0; i < primcount; ++i) {
|
||||
glDrawArrays(mode, *first++, *count++);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue