From a6e86d51a0e32cdc91f2902b0d6b483af884dcca Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Mon, 4 Feb 2019 19:50:16 +0100
Subject: Make APT::StringView public

---
 apt-pkg/cacheiterators.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'apt-pkg/cacheiterators.h')

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 27daf4c43..fbd4bcb8d 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -37,9 +37,7 @@
 #include <iosfwd>
 #include <iterator>
 #include <string>
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
 #include <apt-pkg/string_view.h>
-#endif
 
 #include <string.h>
 
@@ -118,11 +116,7 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 
 	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
 	inline PkgIterator PackageList() const;
-	PkgIterator FindPkg(std::string Arch = "any") const;
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-	APT_HIDDEN PkgIterator FindPkg(APT::StringView Arch = APT::StringView("any", 3)) const;
-	APT_HIDDEN PkgIterator FindPkg(const char *Arch) const;
-#endif
+	PkgIterator FindPkg(APT::StringView Arch = APT::StringView("any", 3)) const;
 	/** \brief find the package with the "best" architecture
 
 	    The best architecture is either the "native" or the first
-- 
cgit v1.2.3