From 372eb8749cfa097031c6ff888508c0b61f577746 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 12 Jun 2010 07:09:45 +0000 Subject: [PATCH] Fix the build git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37110 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kits/interface/menu/menuworld/ViewLayoutFactory.cpp | 6 +++--- src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp index 01d787279c..2812702620 100644 --- a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp +++ b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include @@ -250,8 +250,8 @@ void ViewLayoutFactory::ResizeAroundChildren(BView& view, BPoint margin) BView* childView = view.ChildAt(i); if (childView) { BRect r = childView->Frame(); - fMax_x = max(fMax_x, r.right); - fMax_y = max(fMax_y, r.bottom); + fMax_x = std::max(fMax_x, r.right); + fMax_y = std::max(fMax_y, r.bottom); } } diff --git a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h index 1e91266155..38ae46ec4a 100644 --- a/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h +++ b/src/tests/kits/interface/menu/menuworld/ViewLayoutFactory.h @@ -14,6 +14,7 @@ #ifndef _ViewLayoutFactory_h #define _ViewLayoutFactory_h +#include #include typedef enum { CORNER_TOPLEFT, CORNER_BOTTOMLEFT, @@ -76,4 +77,4 @@ public: void ResizeAroundChildren(BView& view, BPoint margin); }; -#endif /* _ViewLayoutFactory_h */ \ No newline at end of file +#endif /* _ViewLayoutFactory_h */