From af9be4afa6748ceebeb006129a438ca7e7d4f410 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 18 Nov 2011 22:56:58 +0000 Subject: [PATCH] Remove #undef min/max as NOMINMAX is now defined by the project Originally committed to SVN as r5879. --- aegisub/src/audio_colorscheme.cpp | 6 ------ aegisub/src/audio_renderer_waveform.cpp | 5 ----- 2 files changed, 11 deletions(-) diff --git a/aegisub/src/audio_colorscheme.cpp b/aegisub/src/audio_colorscheme.cpp index 6bd720053..8427dfcf5 100644 --- a/aegisub/src/audio_colorscheme.cpp +++ b/aegisub/src/audio_colorscheme.cpp @@ -43,12 +43,6 @@ #include "audio_colorscheme.h" #include "colorspace.h" -// Something is defining "min" and "max" macros, and they interfere with using std::min and std::max -#undef min -#undef max - - - void AudioColorScheme::InitIcyBlue_Normal() { unsigned char *palptr = palette; diff --git a/aegisub/src/audio_renderer_waveform.cpp b/aegisub/src/audio_renderer_waveform.cpp index 47a870f88..bdc944ae3 100644 --- a/aegisub/src/audio_renderer_waveform.cpp +++ b/aegisub/src/audio_renderer_waveform.cpp @@ -49,11 +49,6 @@ #include "audio_renderer_waveform.h" #include "colorspace.h" -#undef min -#undef max - - - AudioWaveformRenderer::AudioWaveformRenderer() : AudioRendererBitmapProvider() , colors_normal(6)