Switch to std::min

2013-09-12 23:15:53 +00:00 · 2013-09-12 23:15:53 +00:00 · b7db46a43a
parent 4848179857
commit b7db46a43a
1 changed files with 1 additions and 1 deletions
--- a/similar/arch/ogl/gr.cpp
+++ b/similar/arch/ogl/gr.cpp
@ -986,7 +986,7 @@ void gr_palette_step_up(int r, int g, int b)
 }

 #undef min
-static inline int min(int x, int y) { return x < y ? x : y; }
+using std::min;

 void gr_palette_load( ubyte *pal )
 {