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
debian/1.8.y
David Kalnischkies 5 years ago
parent
commit
a6c7b26221
  1. 2
      apt-pkg/acquire-item.cc
  2. 6
      apt-pkg/acquire.cc
  3. 4
      apt-pkg/cachefilter.cc
  4. 10
      apt-pkg/cacheset.cc
  5. 2
      apt-pkg/clean.cc
  6. 10
      apt-pkg/indexcopy.cc
  7. 6
      apt-pkg/indexfile.cc
  8. 4
      apt-pkg/install-progress.cc

2
apt-pkg/acquire-item.cc

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

6
apt-pkg/acquire.cc

@ -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() {}

4
apt-pkg/cachefilter.cc

@ -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) {

10
apt-pkg/cacheset.cc

@ -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*/) {

2
apt-pkg/clean.cc

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

10
apt-pkg/indexcopy.cc

@ -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() {}

6
apt-pkg/indexfile.cc

@ -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() {}

4
apt-pkg/install-progress.cc

@ -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