From 1867d69c8bc5821b7e78530c55ca8b5517971b70 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 20 May 2014 15:48:04 -0400 Subject: [PATCH] BPoint: Replace max_c() and min_c() with std::max() and std::min() --- src/kits/interface/Point.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kits/interface/Point.cpp b/src/kits/interface/Point.cpp index 75f5b859e3..cf35ccdd67 100644 --- a/src/kits/interface/Point.cpp +++ b/src/kits/interface/Point.cpp @@ -4,11 +4,14 @@ * * Authors: * Frans van Nispen + * John Scipione, jscipione@gmail.com */ #include +#include + #include #include @@ -21,8 +24,8 @@ const BPoint B_ORIGIN(0, 0); void BPoint::ConstrainTo(BRect rect) { - x = max_c(min_c(x, rect.right), rect.left); - y = max_c(min_c(y, rect.bottom), rect.top); + x = std::max(std::min(x, rect.right), rect.left); + y = std::max(std::min(y, rect.bottom), rect.top); }