removed a useless template specialization to a few std::make_pair

This commit is contained in:
Paolo Cignoni 2013-03-22 16:53:42 +00:00
parent 246345bf19
commit 3a9a72c098
1 changed files with 384 additions and 383 deletions

View File

@ -27,6 +27,7 @@
// Standard headers // Standard headers
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include <utility>
#include <stack> #include <stack>
// VCG headers // VCG headers
@ -1704,7 +1705,7 @@ static std::pair<int,int> RemoveSmallConnectedComponentsSize(MeshType &m, int m
Allocator<MeshType>::DeleteFace(m,(**fpvi)); Allocator<MeshType>::DeleteFace(m,(**fpvi));
} }
} }
return std::make_pair<int,int>(TotalCC,DeletedCC); return std::make_pair(TotalCC,DeletedCC);
} }
@ -1735,7 +1736,7 @@ static std::pair<int,int> RemoveSmallConnectedComponentsDiameter(MeshType &m, Sc
tri::Allocator<MeshType>::DeleteFace(m,(**fpvi)); tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
} }
} }
return std::make_pair<int,int>(TotalCC,DeletedCC); return std::make_pair(TotalCC,DeletedCC);
} }
/// Remove the connected components greater than a given diameter /// Remove the connected components greater than a given diameter
@ -1765,7 +1766,7 @@ static std::pair<int,int> RemoveHugeConnectedComponentsDiameter(MeshType &m, Sca
tri::Allocator<MeshType>::DeleteFace(m,(**fpvi)); tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
} }
} }
return std::make_pair<int,int>(TotalCC,DeletedCC); return std::make_pair(TotalCC,DeletedCC);
} }
}; // end class }; // end class