summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorнаб <nabijaczleweli@nabijaczleweli.xyz>2024-11-12 17:59:19 +0100
committerнаб <nabijaczleweli@nabijaczleweli.xyz>2024-11-12 20:36:21 +0100
commit503e14fbe7d41118a659ead6dde90ebfbc408de9 (patch)
treebbb7bd7a3fd81246f3e1a1f59b65da579aa42345
parente26c9290145da39beeabf5769e61eb38ab2cce78 (diff)
apt-pkg/deb/deblistparser.h: APT::StringView -> std::string_view
-rw-r--r--apt-pkg/deb/deblistparser.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index b791e6f38..06d3715a4 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -20,7 +20,6 @@
#include <string>
#include <vector>
-#include <apt-pkg/string_view.h>
class FileFd;
@@ -32,7 +31,7 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
// Parser Helper
struct WordList
{
- APT::StringView Str;
+ std::string_view Str;
unsigned char Val;
};
@@ -52,7 +51,7 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
unsigned int Type);
bool ParseProvides(pkgCache::VerIterator &Ver);
- APT_HIDDEN static bool GrabWord(APT::StringView Word,const WordList *List,unsigned char &Out);
+ APT_HIDDEN static bool GrabWord(std::string_view Word,const WordList *List,unsigned char &Out);
APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
public:
@@ -83,8 +82,8 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
std::string const &Arch = "");
APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop,
- APT::StringView &Package,
- APT::StringView &Ver, unsigned int &Op,
+ std::string_view &Package,
+ std::string_view &Ver, unsigned int &Op,
bool const ParseArchFlags = false, bool StripMultiArch = true,
bool const ParseRestrictionsList = false,
std::string Arch = "");
@@ -95,7 +94,7 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
virtual ~debListParser();
#ifdef APT_COMPILING_APT
- APT::StringView SHA256() const
+ std::string_view SHA256() const
{
return Section.Find(pkgTagSection::Key::SHA256);
}