From 26d5c078ba839b3aff20513a4bac26e7aab47dc7 Mon Sep 17 00:00:00 2001
From: Eric Bechet <eric.bechet@ulg.ac.be>
Date: Mon, 30 Apr 2012 12:53:28 +0000
Subject: [PATCH] Problem with explicitely given template parameters when
parameters are different (int& vs int) (check new c++ std.)
---
Geo/GModel.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 67d08c6b19..31033616d6 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -2597,12 +2597,12 @@ GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
if(i1 == i2) return 0;
std::map<std::pair<int, int>, GEdge*>::iterator it =
- newEdges.find(std::make_pair<int, int>(i1, i2));
+ newEdges.find(std::make_pair(i1, i2));
if(it == newEdges.end()){
discreteEdge *ge = new discreteEdge
(GModel::current(), GModel::current()->getMaxElementaryNumber(1) + 1, 0, 0);
GModel::current()->add(ge);
- newEdges[std::make_pair<int, int>(i1, i2)] = ge;
+ newEdges[std::make_pair(i1, i2)] = ge;
return ge;
}
else
--
GitLab