Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan

This commit is contained in:
Mats Palmgren
2013-01-15 13:22:03 +01:00
parent 9f4749fbb5
commit 7532b4e736
337 changed files with 1739 additions and 1410 deletions

View File

@@ -15,6 +15,7 @@
#include "nsLayoutUtils.h"
#include "nsGkAtoms.h"
#include "SpanningCellSorter.h"
#include <algorithm>
using namespace mozilla;
using namespace mozilla::layout;
@@ -159,7 +160,7 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
nsGkAtoms::nowrap)) {
minCoord = w;
}
prefCoord = NS_MAX(w, minCoord);
prefCoord = std::max(w, minCoord);
} else if (unit == eStyleUnit_Percent) {
prefPercent = width.GetPercentValue();
} else if (unit == eStyleUnit_Enumerated && aIsCell) {