fixup Fix to build with libxml 2.12.x (fixes #505)

[platform/upstream/libzypp.git] / zypp / ResPool.cc

diff --git a/zypp/ResPool.cc b/zypp/ResPool.cc
index 6fba802..c573533 100644 (file)
--- a/zypp/ResPool.cc
+++ b/zypp/ResPool.cc
@@ -10,13 +10,14 @@
  *
 */
 #include <iostream>
-//#include "zypp/base/Logger.h"
+//#include <zypp/base/Logger.h>
 
-#include "zypp/base/SerialNumber.h"
+#include <zypp/base/SerialNumber.h>
 
-#include "zypp/ResPool.h"
-#include "zypp/pool/PoolImpl.h"
-#include "zypp/pool/PoolStats.h"
+#include <zypp/ZYppFactory.h>
+#include <zypp/ResPool.h>
+#include <zypp/pool/PoolImpl.h>
+#include <zypp/pool/PoolStats.h>
 
 using std::endl;
 
@@ -25,13 +26,17 @@ namespace zypp
 { /////////////////////////////////////////////////////////////////
 
   ///////////////////////////////////////////////////////////////////
+  // class ResPool
+  ///////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
   //
   //   METHOD NAME : ResPool::instance
   //   METHOD TYPE : ResPool
   //
   ResPool ResPool::instance()
   {
-    static ResPool _val( pool::PoolTraits::Impl_constPtr( new pool::PoolImpl ) );
+    static ResPool _val( pool::PoolTraits::Impl_Ptr( new pool::PoolImpl ) );
     return _val;
   }
 
@@ -40,7 +45,7 @@ namespace zypp
   //   METHOD NAME : ResPool::ResPool
   //   METHOD TYPE : Ctor
   //
-  ResPool::ResPool( pool::PoolTraits::Impl_constPtr impl_r )
+  ResPool::ResPool( pool::PoolTraits::Impl_Ptr impl_r )
   : _pimpl( impl_r )
   {}
 
@@ -53,6 +58,9 @@ namespace zypp
   ResPoolProxy ResPool::proxy() const
   { return _pimpl->proxy( *this ); }
 
+  Resolver & ResPool::resolver() const
+  { return *getZYpp()->resolver(); }
+
   const SerialNumber & ResPool::serial() const
   { return _pimpl->serial(); }
 
@@ -62,41 +70,42 @@ namespace zypp
   ResPool::size_type ResPool::size() const
   { return _pimpl->size(); }
 
-
   PoolItem ResPool::find( const sat::Solvable & slv_r ) const
   { return _pimpl->find( slv_r ); }
 
-  ResPool::byCapabilityIndex_iterator ResPool::byCapabilityIndexBegin( const std::string & index_r, Dep depType_r ) const
-  { return _pimpl->_caphashfake.begin(); }
-
-  ResPool::byCapabilityIndex_iterator ResPool::byCapabilityIndexEnd( const std::string & index_r, Dep depType_r ) const
-  { return _pimpl->_caphashfake.end(); }
-
+  ResPool::EstablishedStates ResPool::establishedStates() const
+  { return _pimpl->establishedStates(); }
 
   ResPool::size_type ResPool::knownRepositoriesSize() const
-  { return _pimpl->knownRepositories().size(); }
+  { return _pimpl->knownRepositoriesSize(); }
 
   ResPool::repository_iterator ResPool::knownRepositoriesBegin() const
-  { return _pimpl->knownRepositories().begin(); }
+  { return _pimpl->knownRepositoriesBegin(); }
 
   ResPool::repository_iterator ResPool::knownRepositoriesEnd() const
-  { return _pimpl->knownRepositories().end(); }
+  { return _pimpl->knownRepositoriesEnd(); }
+
+  Repository ResPool::reposFind( const std::string & alias_r ) const
+  { return _pimpl->reposFind( alias_r ); }
+
+  bool ResPool::hardLockQueriesEmpty() const
+  { return _pimpl->hardLockQueries().empty(); }
+
+  ResPool::size_type ResPool::hardLockQueriesSize() const
+  { return _pimpl->hardLockQueries().size(); }
+
+  ResPool::hardLockQueries_iterator ResPool::hardLockQueriesBegin() const
+  { return _pimpl->hardLockQueries().begin(); }
 
+  ResPool::hardLockQueries_iterator ResPool::hardLockQueriesEnd() const
+  { return _pimpl->hardLockQueries().end(); }
 
-  void ResPool::setAdditionalRequire( const AdditionalCapabilities & capset ) const
-  { _pimpl->setAdditionalRequire( capset ); }
-  ResPool::AdditionalCapabilities & ResPool::additionalRequire() const
-  { return _pimpl->additionalRequire(); }
+  void ResPool::setHardLockQueries( const HardLockQueries & newLocks_r )
+  { _pimpl->setHardLockQueries( newLocks_r ); }
 
-  void ResPool::setAdditionalConflict( const AdditionalCapabilities & capset ) const
-  { _pimpl->setAdditionalConflict( capset ); }
-  ResPool::AdditionalCapabilities & ResPool::additionaConflict() const
-  { return _pimpl->additionaConflict(); }
+  void ResPool::getHardLockQueries( HardLockQueries & activeLocks_r )
+  { _pimpl->getHardLockQueries( activeLocks_r ); }
 
-  void ResPool::setAdditionalProvide( const AdditionalCapabilities & capset ) const
-  { _pimpl->setAdditionalProvide( capset ); }
-  ResPool::AdditionalCapabilities & ResPool::additionaProvide() const
-  { return _pimpl->additionaProvide(); }
 
   const pool::PoolTraits::ItemContainerT & ResPool::store() const
   { return _pimpl->store(); }