Browse Source

remove pointless APT_PURE from void functions

Earlier gcc versions used to complain that you should add them althrough
there isn't a lot of point to it if you think about it, but now gcc (>= 8)
complains about the attribute being present.

warning: ‘pure’ attribute on function returning ‘void’ [-Wattributes]

Reported-By: gcc -Wattributes
Gbp-Dch: Ignore
tags/debian/1.6_alpha6
David Kalnischkies 3 years ago
parent
commit
a6c7b26221
8 changed files with 22 additions and 22 deletions
  1. +1
    -1
      apt-pkg/acquire-item.cc
  2. +3
    -3
      apt-pkg/acquire.cc
  3. +2
    -2
      apt-pkg/cachefilter.cc
  4. +5
    -5
      apt-pkg/cacheset.cc
  5. +1
    -1
      apt-pkg/clean.cc
  6. +5
    -5
      apt-pkg/indexcopy.cc
  7. +3
    -3
      apt-pkg/indexfile.cc
  8. +2
    -2
      apt-pkg/install-progress.cc

+ 1
- 1
apt-pkg/acquire-item.cc View File

@@ -766,7 +766,7 @@ std::string pkgAcquire::Item::ShortDesc() const /*{{{*/
return DescURI();
}
/*}}}*/
APT_PURE void pkgAcquire::Item::Finished() /*{{{*/
void pkgAcquire::Item::Finished() /*{{{*/
{
}
/*}}}*/


+ 3
- 3
apt-pkg/acquire.cc View File

@@ -1431,6 +1431,6 @@ pkgAcquire::UriIterator::UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), C
}
}

APT_PURE pkgAcquire::UriIterator::~UriIterator() {}
APT_PURE pkgAcquire::MethodConfig::~MethodConfig() {}
APT_PURE pkgAcquireStatus::~pkgAcquireStatus() {}
pkgAcquire::UriIterator::~UriIterator() {}
pkgAcquire::MethodConfig::~MethodConfig() {}
pkgAcquireStatus::~pkgAcquireStatus() {}

+ 2
- 2
apt-pkg/cachefilter.cc View File

@@ -27,8 +27,8 @@ namespace APT {
APT_HIDDEN std::unordered_map<std::string, std::vector<std::string>> ArchToTupleMap;

namespace CacheFilter {
APT_PURE Matcher::~Matcher() {}
APT_PURE PackageMatcher::~PackageMatcher() {}
Matcher::~Matcher() {}
PackageMatcher::~PackageMatcher() {}

// Name matches RegEx /*{{{*/
PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) {


+ 5
- 5
apt-pkg/cacheset.cc View File

@@ -737,7 +737,7 @@ void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const /*pci*/,
}
/*}}}*/
// canNotFindPackage - handle the case no package is found from a string/*{{{*/
APT_PURE void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) {
void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const /*pci*/, pkgCacheFile &/*Cache*/, std::string const &/*str*/) {
}
/*}}}*/
/*}}}*/
@@ -863,17 +863,17 @@ APT_IGNORE_DEPRECATED_POP
}
}
// showTaskSelection /*{{{*/
APT_PURE void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/,
void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &/*pkg*/,
std::string const &/*pattern*/) {
}
/*}}}*/
// showRegExSelection /*{{{*/
APT_PURE void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/*pkg*/,
void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &/*pkg*/,
std::string const &/*pattern*/) {
}
/*}}}*/
// showFnmatchSelection /*{{{*/
APT_PURE void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &/*pkg*/,
void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const &/*pkg*/,
std::string const &/*pattern*/) {
}
/*}}}*/
@@ -901,7 +901,7 @@ APT_IGNORE_DEPRECATED_POP
break;
}
}
APT_PURE void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/,
void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/,
pkgCache::VerIterator const /*Ver*/,
std::string const &/*ver*/,
bool const /*verIsRel*/) {


+ 1
- 1
apt-pkg/clean.cc View File

@@ -148,4 +148,4 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
/*}}}*/

pkgArchiveCleaner::pkgArchiveCleaner() : d(NULL) {}
APT_PURE pkgArchiveCleaner::~pkgArchiveCleaner() {}
pkgArchiveCleaner::~pkgArchiveCleaner() {}

+ 5
- 5
apt-pkg/indexcopy.cc View File

@@ -785,13 +785,13 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
/*}}}*/

IndexCopy::IndexCopy() : d(nullptr), Section(nullptr) {}
APT_PURE IndexCopy::~IndexCopy() {}
IndexCopy::~IndexCopy() {}

PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}
APT_PURE PackageCopy::~PackageCopy() {}
PackageCopy::~PackageCopy() {}
SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}
APT_PURE SourceCopy::~SourceCopy() {}
SourceCopy::~SourceCopy() {}
TranslationsCopy::TranslationsCopy() : d(nullptr), Section(nullptr) {}
APT_PURE TranslationsCopy::~TranslationsCopy() {}
TranslationsCopy::~TranslationsCopy() {}
SigVerify::SigVerify() : d(NULL) {}
APT_PURE SigVerify::~SigVerify() {}
SigVerify::~SigVerify() {}

+ 3
- 3
apt-pkg/indexfile.cc View File

@@ -407,6 +407,6 @@ pkgCache::PkgFileIterator pkgDebianIndexFile::FindInCache(pkgCache &Cache) const
return File;
}

APT_PURE pkgIndexFile::~pkgIndexFile() {}
APT_PURE pkgDebianIndexTargetFile::~pkgDebianIndexTargetFile() {}
APT_PURE pkgDebianIndexRealFile::~pkgDebianIndexRealFile() {}
pkgIndexFile::~pkgIndexFile() {}
pkgDebianIndexTargetFile::~pkgDebianIndexTargetFile() {}
pkgDebianIndexRealFile::~pkgDebianIndexRealFile() {}

+ 2
- 2
apt-pkg/install-progress.cc View File

@@ -103,7 +103,7 @@ void PackageManagerProgressFd::StartDpkg()
WriteToStatusFd(GetProgressFdString("pmstatus", "dpkg-exec", StepsDone, StepsTotal, _("Running dpkg")));
}

APT_PURE void PackageManagerProgressFd::Stop()
void PackageManagerProgressFd::Stop()
{
}

@@ -184,7 +184,7 @@ void PackageManagerProgressDeb822Fd::StartDpkg()
WriteToStatusFd(GetProgressDeb822String("progress", nullptr, StepsDone, StepsTotal, _("Running dpkg")));
}

APT_PURE void PackageManagerProgressDeb822Fd::Stop()
void PackageManagerProgressDeb822Fd::Stop()
{
}



Loading…
Cancel
Save