Imported Upstream version 17.9.0

[platform/upstream/libzypp.git] / zypp / sat / SolvableType.h

diff --git a/zypp/sat/SolvableType.h b/zypp/sat/SolvableType.h
index a84c76c..65f4d36 100644 (file)
--- a/zypp/sat/SolvableType.h
+++ b/zypp/sat/SolvableType.h
@@ -62,10 +62,10 @@ namespace zypp
 
       ResKind          kind() const                            { return satSolvable().kind(); }
       bool             isKind( const ResKind & kind_r ) const  { return satSolvable().isKind( kind_r ); }
-      template<class _Res>
-      bool             isKind() const                          { return satSolvable().isKind<_Res>(); }
-      template<class _Iterator>
-      bool isKind( _Iterator begin, _Iterator end ) const      { return satSolvable().isKind( begin, end ); }
+      template<class TRes>
+      bool             isKind() const                          { return satSolvable().template isKind<TRes>(); }
+      template<class TIterator>
+      bool isKind( TIterator begin, TIterator end ) const      { return satSolvable().isKind( begin, end ); }
 
       std::string      name() const                            { return satSolvable().name(); }
       Edition          edition() const                         { return satSolvable().edition(); }
@@ -77,7 +77,10 @@ namespace zypp
 
       bool             isSystem() const                        { return satSolvable().isSystem(); }
       bool             onSystemByUser() const                  { return satSolvable().onSystemByUser(); }
+      bool             onSystemByAuto() const                  { return satSolvable().onSystemByAuto(); }
+      bool             identIsAutoInstalled() const            { return satSolvable().identIsAutoInstalled(); }
       bool             multiversionInstall() const             { return satSolvable().multiversionInstall(); }
+      bool              identTriggersRebootNeededHint() const   { return satSolvable().identTriggersRebootNeededHint(); }
 
       Date             buildtime() const                       { return satSolvable().buildtime(); }
       Date             installtime() const                     { return satSolvable().installtime(); }
@@ -133,6 +136,7 @@ namespace zypp
       bool             lookupBoolAttribute( const SolvAttr & attr ) const      { return satSolvable().lookupBoolAttribute( attr ); }
       detail::IdType   lookupIdAttribute( const SolvAttr & attr ) const        { return satSolvable().lookupIdAttribute( attr ); }
       unsigned long long lookupNumAttribute( const SolvAttr & attr ) const     { return satSolvable().lookupNumAttribute( attr ); }
+      unsigned long long lookupNumAttribute( const SolvAttr & attr, unsigned long long notfound_r ) const      { return satSolvable().lookupNumAttribute( attr, notfound_r ); }
       CheckSum         lookupCheckSumAttribute( const SolvAttr & attr ) const  { return satSolvable().lookupCheckSumAttribute( attr ); }
       OnMediaLocation  lookupLocation() const                  { return satSolvable().lookupLocation(); }
       Solvable::IdType id() const                                      { return satSolvable().id(); }
@@ -198,9 +202,9 @@ namespace zypp
     { return lhs < rhs.satSolvable(); }
 
     /** \relates SolvableType Test whether the \ref Solvable is of a certain \ref ResKind. */
-    template<class _Res, class Derived>
+    template<class TRes, class Derived>
     inline bool isKind( const SolvableType<Derived> & solvable_r )
-    { return isKind<_Res>( solvable_r.satSolvable() ); }
+    { return isKind<TRes>( solvable_r.satSolvable() ); }
 
     /** \relates SolvableType Test for same content. */
     template <class LDerived, class RDerived>