Sfoglia il codice sorgente

remove the "typename" from the const_iterators as gcc-4.4 doesn't like
them and gcc-4.5 does the right thing (TM) with and without them

David Kalnischkies 16 anni fa
parent
commit
6d052eba8c
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      apt-pkg/cacheset.h

+ 2 - 2
apt-pkg/cacheset.h

@@ -61,7 +61,7 @@ public:									/*{{{*/
 		};
 		};
 	};
 	};
 	// 103. set::iterator is required to be modifiable, but this allows modification of keys
 	// 103. set::iterator is required to be modifiable, but this allows modification of keys
-	typedef typename APT::PackageSet::const_iterator iterator;
+	typedef APT::PackageSet::const_iterator iterator;
 
 
 	using std::set<pkgCache::PkgIterator>::insert;
 	using std::set<pkgCache::PkgIterator>::insert;
 	inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); };
 	inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); };
@@ -169,7 +169,7 @@ public:									/*{{{*/
 		inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
 		inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
 	};
 	};
 	// 103. set::iterator is required to be modifiable, but this allows modification of keys
 	// 103. set::iterator is required to be modifiable, but this allows modification of keys
-	typedef typename APT::VersionSet::const_iterator iterator;
+	typedef APT::VersionSet::const_iterator iterator;
 
 
 	using std::set<pkgCache::VerIterator>::insert;
 	using std::set<pkgCache::VerIterator>::insert;
 	inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); };
 	inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); };