Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid Typedef Shadowing

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@491 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-01-12 16:11:43 +00:00
parent af776e4b85
commit 688e0e8feb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
View File

@@ -56,11 +56,11 @@
#include <OpenMesh/Tools/Decimater/ModIndependentSetsT.hh> #include <OpenMesh/Tools/Decimater/ModIndependentSetsT.hh>
typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh; typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh;
typedef OpenMesh::Decimater::DecimaterT<Mesh> Decimater; typedef OpenMesh::Decimater::DecimaterT<Mesh> DecimaterProgMesh;
typedef OpenMesh::Decimater::ModNormalFlippingT<Decimater> ModNormalFlipping; typedef OpenMesh::Decimater::ModNormalFlippingT<DecimaterProgMesh> ModNormalFlipping;
typedef OpenMesh::Decimater::ModQuadricT<Decimater> ModQuadric; typedef OpenMesh::Decimater::ModQuadricT<DecimaterProgMesh> ModQuadric;
typedef OpenMesh::Decimater::ModProgMeshT<Decimater> ModProgMesh; typedef OpenMesh::Decimater::ModProgMeshT<DecimaterProgMesh> ModProgMesh;
typedef OpenMesh::Decimater::ModIndependentSetsT<Decimater> ModIndependentSets; typedef OpenMesh::Decimater::ModIndependentSetsT<DecimaterProgMesh> ModIndependentSets;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ private:
template <typename D> template <typename D>
const double ModBalancerT<D>::inv_log2_ = 1.0/std::log(2.0); const double ModBalancerT<D>::inv_log2_ = 1.0/std::log(2.0);
typedef ModBalancerT<Decimater> ModBalancer; typedef ModBalancerT<DecimaterProgMesh> ModBalancer;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -271,7 +271,7 @@ int main(int argc, char **argv)
{ {
OpenMesh::Utils::Timer t; OpenMesh::Utils::Timer t;
Decimater decimater(mesh); DecimaterProgMesh decimater(mesh);
ModProgMesh::Handle modPM; ModProgMesh::Handle modPM;
ModBalancer::Handle modB; ModBalancer::Handle modB;