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/pkgcache.h | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index c20320a56..4511aade0 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -81,9 +81,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
 #include <apt-pkg/string_view.h>
-#endif
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
@@ -199,11 +197,7 @@ class pkgCache								/*{{{*/
    // Memory mapped cache file
    std::string CacheFile;
    MMap &Map;
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-   APT_HIDDEN map_id_t sHash(APT::StringView S) const APT_PURE;
-#endif
-   map_id_t sHash(const std::string &S) const APT_PURE;
-   map_id_t sHash(const char *S) const APT_PURE;
+   map_id_t sHash(APT::StringView S) const APT_PURE;
    
    public:
    
@@ -228,11 +222,7 @@ class pkgCache								/*{{{*/
    inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}
       
    // String hashing function (512 range)
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-   APT_HIDDEN inline map_id_t Hash(APT::StringView S) const {return sHash(S);}
-#endif
-   inline map_id_t Hash(const std::string &S) const {return sHash(S);}
-   inline map_id_t Hash(const char *S) const {return sHash(S);}
+   inline map_id_t Hash(APT::StringView S) const {return sHash(S);}
 
    APT_HIDDEN uint32_t CacheHash();
 
@@ -240,25 +230,16 @@ class pkgCache								/*{{{*/
    static const char *Priority(unsigned char Priority);
    
    // Accessors
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-   APT_HIDDEN GrpIterator FindGrp(APT::StringView Name);
-   APT_HIDDEN PkgIterator FindPkg(APT::StringView Name);
-   APT_HIDDEN PkgIterator FindPkg(APT::StringView Name, APT::StringView Arch);
-#endif
+   GrpIterator FindGrp(APT::StringView Name);
+   PkgIterator FindPkg(APT::StringView Name);
+   PkgIterator FindPkg(APT::StringView Name, APT::StringView Arch);
 
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
    APT::StringView ViewString(map_stringitem_t idx) const
    {
       char *name = StrP + idx;
       uint16_t len = *reinterpret_cast<const uint16_t*>(name - sizeof(uint16_t));
       return APT::StringView(name, len);
    }
-#endif
-
-
-   GrpIterator FindGrp(const std::string &Name);
-   PkgIterator FindPkg(const std::string &Name);
-   PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
 
    Header &Head() {return *HeaderP;}
    inline GrpIterator GrpBegin();
-- 
cgit v1.2.3