Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / devel / devel.ma / MaTest.cc

diff --git a/devel/devel.ma/MaTest.cc b/devel/devel.ma/MaTest.cc
index 24629a6..24bd198 100644 (file)
--- a/devel/devel.ma/MaTest.cc
+++ b/devel/devel.ma/MaTest.cc
@@ -102,15 +102,15 @@ ManagedFile repoProvidePackage( const PoolItem & pi )
 
 namespace zypp
 {
-  template <class TLIterator, class TRIterator, class TFunction>
-      inline int invokeOnEach( TLIterator lbegin_r, TLIterator lend_r,
-                               TRIterator rbegin_r, TRIterator rend_r,
-                               TFunction fnc_r )
+  template <class _LIterator, class _RIterator, class _Function>
+      inline int invokeOnEach( _LIterator lbegin_r, _LIterator lend_r,
+                               _RIterator rbegin_r, _RIterator rend_r,
+                               _Function fnc_r )
       {
         int cnt = 0;
-        for ( TLIterator lit = lbegin_r; lit != lend_r; ++lit )
+        for ( _LIterator lit = lbegin_r; lit != lend_r; ++lit )
         {
-          for ( TRIterator rit = rbegin_r; rit != rend_r; ++rit )
+          for ( _RIterator rit = rbegin_r; rit != rend_r; ++rit )
           {
             ++cnt;
             if ( ! fnc_r( *lit, *rit ) )
@@ -121,6 +121,23 @@ namespace zypp
       }
 }
 
+
+void dbgDu( Selectable::Ptr sel )
+{
+  if ( sel->installedObj() )
+  {
+    DBG << "i: " << sel->installedObj() << endl
+        << sel->installedObj()->diskusage() << endl;
+  }
+  if ( sel->candidateObj() )
+  {
+    DBG << "c: " << sel->candidateObj() << endl
+        << sel->candidateObj()->diskusage() << endl;
+  }
+  INT << sel << endl
+      << getZYpp()->diskUsage() << endl;
+}
+
 ///////////////////////////////////////////////////////////////////
 
 std::ostream & testDump( std::ostream & str, const PoolItem & pi )
@@ -306,8 +323,8 @@ struct MediaChangeReceive : public callback::ReceiveReport<media::MediaChangeRep
 
 namespace container
 {
-  template<class Tp>
-    bool isIn( const std::set<Tp> & cont, const typename std::set<Tp>::value_type & val )
+  template<class _Tp>
+    bool isIn( const std::set<_Tp> & cont, const typename std::set<_Tp>::value_type & val )
     { return cont.find( val ) != cont.end(); }
 }
 ///////////////////////////////////////////////////////////////////
@@ -339,38 +356,38 @@ namespace zypp
 {
 namespace filter
 {
-  template <class TMemFun, class TValue>
+  template <class _MemFun, class _Value>
   class HasValue
   {
     public:
-      HasValue( TMemFun fun_r, TValue val_r )
+      HasValue( _MemFun fun_r, _Value val_r )
       : _fun( fun_r ), _val( val_r )
       {}
-      template <class Tp>
-      bool operator()( const Tp & obj_r ) const
+      template <class _Tp>
+      bool operator()( const _Tp & obj_r ) const
       { return( _fun && (obj_r.*_fun)() == _val ); }
     private:
-      TMemFun _fun;
-      TValue  _val;
+      _MemFun _fun;
+      _Value  _val;
   };
 
-  template <class TMemFun, class TValue>
-  HasValue<TMemFun, TValue> byValue( TMemFun fun_r, TValue val_r )
-  { return HasValue<TMemFun, TValue>( fun_r, val_r ); }
+  template <class _MemFun, class _Value>
+  HasValue<_MemFun, _Value> byValue( _MemFun fun_r, _Value val_r )
+  { return HasValue<_MemFun, _Value>( fun_r, val_r ); }
 }
 
 }
 
 template <class L>
-struct TestO { TestO( const L & lhs ) : _lhs( lhs ) {} const L & _lhs; };
+struct _TestO { _TestO( const L & lhs ) : _lhs( lhs ) {} const L & _lhs; };
 
 template <class L>
-std::ostream & operator<<( std::ostream & str, const TestO<L> & obj )
+std::ostream & operator<<( std::ostream & str, const _TestO<L> & obj )
 { const L & lhs( obj._lhs); return str << (lhs?'_':'*') << (lhs.empty()?'e':'_') << "'" << lhs << "'"; }
 
 template <class L>
-TestO<L> testO( const L & lhs )
-{ return TestO<L>( lhs ); }
+_TestO<L> testO( const L & lhs )
+{ return _TestO<L>( lhs ); }
 
 template <class L, class R>
 void testCMP( const L & lhs, const R & rhs )
@@ -391,7 +408,7 @@ void testCMP( const L & lhs, const R & rhs )
 
 inline bool useRepo( RepoInfo & repo )
 {
-  //return repo.alias()  == "matest";
+  return repo.alias()  == "matest";
   return repo.enabled();
 }