From f7efa76f35a69384c10ae7f3258a03ccecbde49a Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 23 Jun 2010 14:25:08 +0000
Subject: [PATCH] added a missing std:: to max()

---
 vcg/complex/trimesh/edge_collapse.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcg/complex/trimesh/edge_collapse.h b/vcg/complex/trimesh/edge_collapse.h
index b1081493..48480dcf 100644
--- a/vcg/complex/trimesh/edge_collapse.h
+++ b/vcg/complex/trimesh/edge_collapse.h
@@ -183,8 +183,8 @@ class EdgeCollapse
       {
         ++ VertCnt[vfi.V1()];
         ++ VertCnt[vfi.V2()];
-        if(vfi.V1()<vfi.V2()) ++EdgeCnt[make_pair(vfi.V1(),vfi.V2())];
-                         else ++EdgeCnt[make_pair(vfi.V2(),vfi.V1())];
+        if(vfi.V1()<vfi.V2()) ++EdgeCnt[std::make_pair(vfi.V1(),vfi.V2())];
+                         else ++EdgeCnt[std::make_pair(vfi.V2(),vfi.V1())];
       }
       // Now a loop to add dummy stuff: add the dummy vertex and two dummy edges
       // (and remember to increase the counters for the two boundary vertexes involved)