and some more fixes for MSVC, still re #49

gentryx · Feb 21, 2017 · dee4cf1 · dee4cf1
1 parent d1e8fef
commit dee4cf1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/libgeodecomp/geometry/regionbasedadjacency.h b/src/libgeodecomp/geometry/regionbasedadjacency.h
@@ -39,7 +39,7 @@ class RegionBasedAdjacency : public Adjacency
 
     explicit RegionBasedAdjacency(std::size_t maxSize = (std::size_t(1) << 30)) :
         regions(1),
-        limits(1, std::numeric_limits<int>().max()),
+        limits(1, std::numeric_limits<int>().(max)()),
         maxSize(maxSize)
     {}
 
@@ -127,10 +127,10 @@ class RegionBasedAdjacency : public Adjacency
         Region<2> buf;
         swap(buf, regions[i]);
 
-        regions.insert(regions.begin() + i, Region<2>());
-        limits.insert(limits.begin() + i, newLimit);
+        regions.insert(regions.begin() + int(i), Region<2>());
+        limits.insert(limits.begin() + int(i), newLimit);
 
-        Region<2>::StreakIterator middle = buf.streakIteratorOnOrAfter(Coord<2>(std::numeric_limits<int>().max(), newLimit));
+        Region<2>::StreakIterator middle = buf.streakIteratorOnOrAfter(Coord<2>(std::numeric_limits<int>().(max)(), newLimit));
 
         for (Region<2>::StreakIterator iter = buf.beginStreak(); iter != middle; ++iter) {
             regions[i + 0] << *iter;