Run unifdef -DAPT_PKG_ABI=700 again

main picked up a couple new ifdefs since the branch started; so
clean them up again.

3 files changed, 0 insertions, 34 deletions

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index c7a4ab0e7..9c0ce40d2 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -55,11 +55,7 @@ HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Ha
 {
 }
 
-#if APT_PKG_ABI > 600
 HashString::HashString(std::string_view StringedHash)			/*{{{*/
-#else
-HashString::HashString(std::string StringedHash)        /*{{{*/
-#endif
 {
    if (StringedHash.find(":") == std::string::npos)
    {
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 69b742f10..18feae57b 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -40,11 +40,7 @@ class APT_PUBLIC HashString
 
  public:
    HashString(std::string Type, std::string Hash);
-#if APT_PKG_ABI > 600
    explicit HashString(std::string_view StringedHashString);  // init from str as "type:hash"
-#else
-   explicit HashString(std::string StringedHashString);  // init from str as "type:hash"
-#endif
    HashString();
 
    // get hash type used
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 996302971..08e7aeb72 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -109,31 +109,5 @@ AptScopeWrapper(F) -> AptScopeWrapper<F>;
 
 
 #ifndef APT_COMPILING_APT
-#if APT_PKG_ABI <= 600
-#if __cplusplus >= 201103L
-	#define APT_OVERRIDE override
-#else
-	#define APT_OVERRIDE /* no c++11 standard */
-#endif
-#define APT_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-#define	FLAG(f)			(1L << (f))
-#define	SETFLAG(v,f)	((v) |= FLAG(f))
-#define CLRFLAG(v,f)	((v) &=~FLAG(f))
-#define	CHKFLAG(v,f)	((v) &  FLAG(f) ? true : false)
-#if APT_GCC_VERSION >= 0x0300
-	#define APT_DEPRECATED	__attribute__ ((deprecated))
-	#define APT_DEPRECATED_MSG(X)	__attribute__ ((deprecated(X)))
-	#define APT_NORETURN	__attribute__((noreturn))
-	#define APT_UNUSED	__attribute__((unused))
-	#define APT_MUSTCHECK		__attribute__((warn_unused_result))
-#else
-	#define APT_DEPRECATED
-	#define APT_DEPRECATED_MSG(X)
-	#define APT_NORETURN
-	#define APT_UNUSED
-	#define APT_MUSTCHECK
-#endif
-#define APT_IGNORE_DEPRECATED(XXX) XXX
-#endif
 #endif
 #endif