Drop C++11 elements from headers

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 1063d6f9e38920cfd04b60327f64f381c35cd98f..f8321079aee5407ecb598a002b00f97abf237cc3 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -329,8 +329,8 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
           DependencyProxy const * operator->() const { return this; }
           DependencyProxy * operator->() { return this; }
        };
           DependencyProxy const * operator->() const { return this; }
           DependencyProxy * operator->() { return this; }
        };

-       inline DependencyProxy operator->() const {return { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
-       inline DependencyProxy operator->() {return { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       inline DependencyProxy operator->() const {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       inline DependencyProxy operator->() {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}

        void ReMap(void const * const oldMap, void const * const newMap)
        {
                Iterator<Dependency, DepIterator>::ReMap(oldMap, newMap);
        void ReMap(void const * const oldMap, void const * const newMap)
        {
                Iterator<Dependency, DepIterator>::ReMap(oldMap, newMap);

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 07a21d27fb1e2c3e5481f90cad046c71b8f78d80..ef7afda944d177f21ab56a322e2a19c0d5bf0c8e 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -42,7 +42,8 @@
 #include <unistd.h>
 
 #include <apti18n.h>
 #include <unistd.h>
 
 #include <apti18n.h>

-                                                                       /*}}}*/
+
+template<class T> using Dynamic = pkgCacheGenerator::Dynamic<T>;                                                       /*}}}*/

 typedef std::vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
 typedef std::vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 97b91ba9ff1345468bb5d839c42c2ffd628832bc..46fccdaa5eecd6d5f39048d9bbd7a83dfbf6b996 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -135,7 +135,6 @@ class APT_HIDDEN pkgCacheListParser
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;

-   template<class T> using Dynamic = pkgCacheGenerator::Dynamic<T>;

 
    // Some cache items
    pkgCache::VerIterator OldDepVer;
 
    // Some cache items
    pkgCache::VerIterator OldDepVer;