From 839d5b6ad87e7766e558fda23b2636cadeb3d527 Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Tue, 30 Nov 2004 01:23:24 +0000
Subject: minor issue

---
 src/CurrentWindowCmd.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 94fc85b..e68ec8f 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -88,17 +88,12 @@ void MoveCmd::real_execute() {
 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);
-- 
cgit v0.11.2