diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h index 7e22747fb..7c579b752 100644 --- a/aegisub/libaegisub/include/libaegisub/log.h +++ b/aegisub/libaegisub/include/libaegisub/log.h @@ -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) diff --git a/aegisub/src/gl_wrap.h b/aegisub/src/gl_wrap.h index 72eddfea1..a358e0a80 100644 --- a/aegisub/src/gl_wrap.h +++ b/aegisub/src/gl_wrap.h @@ -65,7 +65,7 @@ typedef GLuint GLhandleARB; #define GL_EXT(type, name) \ static type name = reinterpret_cast(glGetProc(#name)); \ if (!name) { \ - name = & name ## Fallback; \ + name = reinterpret_cast(& name ## Fallback); \ } #endif diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp index b11030049..2831609ab 100644 --- a/aegisub/src/visual_tool_vector_clip.cpp +++ b/aegisub/src/visual_tool_vector_clip.cpp @@ -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++); }