diff options
author | Christophe Fergeau <cfergeau@redhat.com> | 2012-02-19 23:16:06 +0100 |
---|---|---|
committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-02-23 19:03:25 +0100 |
commit | 5751b1ae8a471c660349f548d7fec6a2a2dfa62c (patch) | |
tree | 66237a0c36aa3e174da7d1081a655ace8e377cc0 | |
parent | 5e55cc27b20bf8c00f0a85b94b615b13e528932c (diff) |
mingw: use explicit std:: namespace for min/max
-rw-r--r-- | vdagent/desktop_layout.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vdagent/desktop_layout.cpp b/vdagent/desktop_layout.cpp index f880fd3..24f3838 100644 --- a/vdagent/desktop_layout.cpp +++ b/vdagent/desktop_layout.cpp @@ -150,10 +150,10 @@ void DesktopLayout::normalize_displays_pos() for (iter = _displays.begin(); iter != _displays.end(); iter++) { mode = *iter; if (mode->_attached) { - min_x = min(min_x, mode->_pos_x); - min_y = min(min_y, mode->_pos_y); - max_x = max(max_x, mode->_pos_x + (LONG)mode->_width); - max_y = max(max_y, mode->_pos_y + (LONG)mode->_height); + min_x = std::min(min_x, mode->_pos_x); + min_y = std::min(min_y, mode->_pos_y); + max_x = std::max(max_x, mode->_pos_x + (LONG)mode->_width); + max_y = std::max(max_y, mode->_pos_y + (LONG)mode->_height); } } if (min_x || min_y) { |