Commit 688e0e8f authored by Jan Möbius's avatar Jan Möbius
Browse files

Avoid Typedef Shadowing

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@491 fdac6126-5c0c-442c-9429-916003d36597
parent af776e4b
......@@ -56,11 +56,11 @@
#include <OpenMesh/Tools/Decimater/ModIndependentSetsT.hh>
typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh;
typedef OpenMesh::Decimater::DecimaterT<Mesh> Decimater;
typedef OpenMesh::Decimater::ModNormalFlippingT<Decimater> ModNormalFlipping;
typedef OpenMesh::Decimater::ModQuadricT<Decimater> ModQuadric;
typedef OpenMesh::Decimater::ModProgMeshT<Decimater> ModProgMesh;
typedef OpenMesh::Decimater::ModIndependentSetsT<Decimater> ModIndependentSets;
typedef OpenMesh::Decimater::DecimaterT<Mesh> DecimaterProgMesh;
typedef OpenMesh::Decimater::ModNormalFlippingT<DecimaterProgMesh> ModNormalFlipping;
typedef OpenMesh::Decimater::ModQuadricT<DecimaterProgMesh> ModQuadric;
typedef OpenMesh::Decimater::ModProgMeshT<DecimaterProgMesh> ModProgMesh;
typedef OpenMesh::Decimater::ModIndependentSetsT<DecimaterProgMesh> ModIndependentSets;
// ----------------------------------------------------------------------------
......@@ -168,7 +168,7 @@ private:
template <typename D>
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;
Decimater decimater(mesh);
DecimaterProgMesh decimater(mesh);
ModProgMesh::Handle modPM;
ModBalancer::Handle modB;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment