From ae4ac69bb3855bfee7d6fd7c609d0b8371d5a388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 13 Jan 2012 09:46:55 +0000
Subject: [PATCH] Fixed typedef shadowing

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@494 fdac6126-5c0c-442c-9429-916003d36597
---
 src/OpenMesh/Apps/Decimating/decimater.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/OpenMesh/Apps/Decimating/decimater.cc b/src/OpenMesh/Apps/Decimating/decimater.cc
index 42249c97..fe6b5e17 100644
--- a/src/OpenMesh/Apps/Decimating/decimater.cc
+++ b/src/OpenMesh/Apps/Decimating/decimater.cc
@@ -205,7 +205,7 @@ struct DecOptions
 
 //----------------------------------------------------- decimater wrapper  ----
 //
-template <typename Mesh, typename Decimater>
+template <typename Mesh, typename DecimaterType>
 bool
 decimate(const std::string &_ifname,
          const std::string &_ofname,
@@ -247,7 +247,7 @@ decimate(const std::string &_ifname,
      }
 
      // ---- 1 - create decimater instance
-     Decimater decimater( mesh );
+     DecimaterType decimater( mesh );
 
      // ---- 2 - register modules
      if (gverbose)
@@ -255,7 +255,7 @@ decimate(const std::string &_ifname,
 
 
 
-     typename OpenMesh::Decimater::ModAspectRatioT<Decimater>::Handle modAR;
+     typename OpenMesh::Decimater::ModAspectRatioT<DecimaterType>::Handle modAR;
 
      if (_opt.AR.is_enabled())
      {
@@ -264,7 +264,7 @@ decimate(const std::string &_ifname,
          decimater.module( modAR ).set_aspect_ratio( _opt.AR ) ;
      }
 
-     typename OpenMesh::Decimater::ModEdgeLengthT<Decimater>::Handle modEL;
+     typename OpenMesh::Decimater::ModEdgeLengthT<DecimaterType>::Handle modEL;
 
      if (_opt.EL.is_enabled())
      {
@@ -273,7 +273,7 @@ decimate(const std::string &_ifname,
          decimater.module( modEL ).set_edge_length( _opt.EL ) ;
      }
 
-     typename OpenMesh::Decimater::ModHausdorffT <Decimater>::Handle modHD;
+     typename OpenMesh::Decimater::ModHausdorffT <DecimaterType>::Handle modHD;
 
      if (_opt.HD.is_enabled())
      {
@@ -283,12 +283,12 @@ decimate(const std::string &_ifname,
 
      }
 
-     typename OpenMesh::Decimater::ModIndependentSetsT<Decimater>::Handle modIS;
+     typename OpenMesh::Decimater::ModIndependentSetsT<DecimaterType>::Handle modIS;
 
      if ( _opt.IS.is_enabled() )
        decimater.add(modIS);
 
-     typename OpenMesh::Decimater::ModNormalDeviationT<Decimater>::Handle modND;
+     typename OpenMesh::Decimater::ModNormalDeviationT<DecimaterType>::Handle modND;
 
      if (_opt.ND.is_enabled())
      {
@@ -297,7 +297,7 @@ decimate(const std::string &_ifname,
          decimater.module( modND ).set_normal_deviation( _opt.ND );
      }
 
-     typename OpenMesh::Decimater::ModNormalFlippingT<Decimater>::Handle modNF;
+     typename OpenMesh::Decimater::ModNormalFlippingT<DecimaterType>::Handle modNF;
 
      if (_opt.NF.is_enabled())
      {
@@ -307,12 +307,12 @@ decimate(const std::string &_ifname,
      }
 
 
-     typename OpenMesh::Decimater::ModProgMeshT<Decimater>::Handle       modPM;
+     typename OpenMesh::Decimater::ModProgMeshT<DecimaterType>::Handle       modPM;
 
      if ( _opt.PM.is_enabled() )
        decimater.add(modPM);
 
-     typename OpenMesh::Decimater::ModQuadricT<Decimater>::Handle        modQ;
+     typename OpenMesh::Decimater::ModQuadricT<DecimaterType>::Handle        modQ;
 
      if (_opt.Q.is_enabled())
      {
@@ -321,7 +321,7 @@ decimate(const std::string &_ifname,
          decimater.module( modQ ).set_max_err( _opt.Q );
      }
 
-     typename OpenMesh::Decimater::ModRoundnessT<Decimater>::Handle      modR;
+     typename OpenMesh::Decimater::ModRoundnessT<DecimaterType>::Handle      modR;
 
      if ( _opt.R.is_enabled() )
      {