diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-07-25 10:52:42 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-07-25 11:07:20 +0200 |
| commit | 91cdf3199cb8487eb38a14e2d1d5195ebe51e802 (patch) | |
| tree | c2fed3e59de86cded3c558c3a7f51f137730f8a6 /apt-pkg/contrib | |
| parent | 938bf2aa08a57dadfd95869a0a93946269a06076 (diff) | |
bump next-abi check above gcc5-abi bump
Some of the 'simpler' abi changes are included in /sid already guarded
behind #if's and now that we dumped the ABI fpr gcc5 they trigger.
It would probably not hurt to have them trigger and it is an abi break
anyway, but there isn't much point to it and it would be really annoying
if one of them turns out to be a problem as these changes aren't as well
tested as the 'old' abi.
It is slightly incorrect to check for abi >= 17 as /experimental with
this (and other changes) is abi = 15 currently, but writing the correct
check would be just too insane for this dead ends branch. Final
/experimental is probably better of increasing APT_PKG_MAJOR anyhow.
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/configuration.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 00f6ad0f9..e0671bcc0 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -253,7 +253,7 @@ string Configuration::FindDir(const char *Name,const char *Default) const // Configuration::FindVector - Find a vector of values /*{{{*/ // --------------------------------------------------------------------- /* Returns a vector of config values under the given item */ -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 17) vector<string> Configuration::FindVector(const char *Name) const { return FindVector(Name, ""); } #endif vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index fde9cf851..5273b29bb 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -85,7 +85,7 @@ class Configuration * \param Default list of values separated by commas */ std::vector<std::string> FindVector(const char *Name, std::string const &Default) const; std::vector<std::string> FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); }; -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 17) std::vector<std::string> FindVector(const char *Name) const { return FindVector(Name, ""); }; #else std::vector<std::string> FindVector(const char *Name) const; |