M src/CurrentWindowCmd.cc → src/CurrentWindowCmd.cc

@@ -88,17 +88,12 @@ 
 ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
     m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
 
-template<typename T>
-T max(const T& a, const T& b) {
-    return a >= b ? a : b;
-}
-    
 void ResizeCmd::real_execute() {
   
-    int w = max<int>(static_cast<int>(fbwindow().width() + 
+    int w = std::max<int>(static_cast<int>(fbwindow().width() + 
                                       m_step_size_x * fbwindow().winClient().width_inc), 
                      fbwindow().frame().titlebarHeight() * 2 + 10);
-    int h = max<int>(static_cast<int>(fbwindow().height() + 
+    int h = std::max<int>(static_cast<int>(fbwindow().height() + 
                                       m_step_size_y * fbwindow().winClient().height_inc), 
                      fbwindow().frame().titlebarHeight() + 10);
     fbwindow().resize(w, h);