fixed compiler warnings

diff --git a/zypp/solver/detail/ResolverInfoMisc.cc b/zypp/solver/detail/ResolverInfoMisc.cc
index 4e75907..5b8bd06 100644 (file)
--- a/zypp/solver/detail/ResolverInfoMisc.cc
+++ b/zypp/solver/detail/ResolverInfoMisc.cc
@@ -567,7 +567,7 @@ ResolverInfoMisc::message (void) const
 //---------------------------------------------------------------------------
 
 bool
-ResolverInfoMisc::merge (ResolverInfo_Ptr info)
+ResolverInfoMisc::merge (ResolverInfoContainer_Ptr info)
 {
     bool res;
     ResolverInfoMisc_Ptr to_be_merged = dynamic_pointer_cast<ResolverInfoMisc>(info);

diff --git a/zypp/solver/detail/ResolverInfoMisc.h b/zypp/solver/detail/ResolverInfoMisc.h
index a067d34..ef59027 100644 (file)
--- a/zypp/solver/detail/ResolverInfoMisc.h
+++ b/zypp/solver/detail/ResolverInfoMisc.h
@@ -89,7 +89,7 @@ class ResolverInfoMisc : public ResolverInfoContainer {
 
          // ---------------------------------- methods
 
-         virtual bool merge (ResolverInfo_Ptr to_be_merged);
+          virtual bool merge ( ResolverInfoContainer_Ptr to_be_merged);
          virtual ResolverInfo_Ptr copy (void) const;
 
          void addAction (const std::string & action_msg);