Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / devel / devel.ma / main.h

diff --git a/devel/devel.ma/main.h b/devel/devel.ma/main.h
index 9ededb5..cd7ed67 100644 (file)
--- a/devel/devel.ma/main.h
+++ b/devel/devel.ma/main.h
@@ -41,12 +41,12 @@ inline std::ostream & operator<<( std::ostream & str, const Resolvable & res )
 ///////////////////////////////////////////////////////////////////
 
 // connect resolvables interface and implementation.
-template<class TRes>
-  struct ResImplConnect : public TRes
+template<class _Res>
+  struct ResImplConnect : public _Res
   {
   public:
     typedef ResImplConnect               Self;
-    typedef typename TRes::Impl          Impl;
+    typedef typename _Res::Impl          Impl;
     typedef zypp::base::shared_ptr<Impl> ImplPtr;
     typedef zypp::base::intrusive_ptr<Self>       Ptr;
     typedef zypp::base::intrusive_ptr<const Self> constPtr;
@@ -62,12 +62,12 @@ template<class TRes>
   };
 
 
-template<class TImpl>
-  typename TImpl::ResType::Ptr
-  makeResolvable( /*NVRA*/ zypp::base::shared_ptr<TImpl> & impl_r )
+template<class _Impl>
+  typename _Impl::ResType::Ptr
+  makeResolvable( /*NVRA*/ zypp::base::shared_ptr<_Impl> & impl_r )
   {
-    impl_r.reset( new TImpl );
-    return new ResImplConnect<typename TImpl::ResType>( /*NVRA*/ impl_r );
+    impl_r.reset( new _Impl );
+    return new ResImplConnect<typename _Impl::ResType>( /*NVRA*/ impl_r );
   }
 
 ///////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ struct ObjectImpl
   virtual ~ObjectImpl() {};
 
   private:
-    template<class TRes>
+    template<class _Res>
       friend class ResImpl;
     Resolvable * _backRef;
 };