Browse Source

Drop C++11 elements from headers

debian/1.8.y
Julian Andres Klode 7 years ago
parent
commit
350d30d24f
  1. 4
      apt-pkg/cacheiterators.h
  2. 3
      apt-pkg/pkgcachegen.cc
  3. 1
      apt-pkg/pkgcachegen.h

4
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; }
};
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);

3
apt-pkg/pkgcachegen.cc

@ -42,7 +42,8 @@
#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;

1
apt-pkg/pkgcachegen.h

@ -135,7 +135,6 @@ class APT_HIDDEN pkgCacheListParser
{
pkgCacheGenerator *Owner;
friend class pkgCacheGenerator;
template<class T> using Dynamic = pkgCacheGenerator::Dynamic<T>;
// Some cache items
pkgCache::VerIterator OldDepVer;

Loading…
Cancel
Save