Merge branch 'debian/jessie' into debian/experimental

[apt.git] / apt-pkg / aptconfiguration.h

diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index 026493c6df40a560c9ab9a67967da72a39960b6b..c7b8d2d73d68e17b05011f789cfd7398bbb13158 100644 (file)
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -73,7 +73,7 @@ public:                                                                       /*{{{*/
         *  \param All defines if we check against all codes or only against used codes
         *  \return true if we are interested, false otherwise
         */
-       bool static const checkLanguage(std::string Lang, bool const All = false);
+       bool static checkLanguage(std::string Lang, bool const All = false);
 
        /** \brief Returns a vector of Architectures we support
         *
@@ -89,7 +89,7 @@ public:                                                                       /*{{{*/
         *  \param Arch we want to check
         *  \return true if we are interested, false otherwise
         */
-       bool static const checkArchitecture(std::string const &Arch);
+       bool static checkArchitecture(std::string const &Arch);
 
        /** \brief Representation of supported compressors */
        struct Compressor {
@@ -123,9 +123,6 @@ public:                                                                     /*{{{*/
        /** \return Return a comma-separated list of enabled build profile specifications */
        std::string static const getBuildProfilesString();
                                                                        /*}}}*/
-       private:                                                        /*{{{*/
-       void static setDefaultConfigurationForCompressors();
-                                                                       /*}}}*/
 };
                                                                        /*}}}*/
 }