merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

[apt.git] / apt-pkg / edsp / edsplistparser.cc

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 3349e8cce3c7482f5b5f674c82f02bf47a3fcdf0..bcfdb10176397fa0e1c910c6dff9d76d61b97b26 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>


@@ -18,7 +20,7 @@
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/

-edspListParser::edspListParser(FileFd *File, string const &Arch) : debListParser(File, Arch)
+edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)

 {}
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 {}
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/


@@ -31,11 +33,11 @@ bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */

-string edspListParser::Description()
+std::string edspListParser::Description()

 {
    return "";
 }
 {
    return "";
 }

-string edspListParser::DescriptionLanguage()
+std::string edspListParser::DescriptionLanguage()

 {
    return "";
 }
 {
    return "";
 }


@@ -83,7 +85,7 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                                                                        /*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
                                                                        /*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,

-                                   FileFd &File, string component)
+                                   FileFd &File, std::string component)

 {
    return true;
 }
 {
    return true;
 }