diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-04 19:50:16 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-06-11 14:45:55 +0200 |
commit | a6e86d51a0e32cdc91f2902b0d6b483af884dcca (patch) | |
tree | 528867efd4499d088a7204470b0ff10bdb87457f /apt-pkg/contrib/strutl.h | |
parent | 93e0ba2bfde58e6c1fbad53614083be8754d7ee8 (diff) |
Make APT::StringView public
Diffstat (limited to 'apt-pkg/contrib/strutl.h')
-rw-r--r-- | apt-pkg/contrib/strutl.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index ae0aaedf9..3853d5ba6 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -20,9 +20,7 @@ #include <limits> #include <string> #include <vector> -#ifdef APT_PKG_EXPOSE_STRING_VIEW #include <apt-pkg/string_view.h> -#endif #include <stddef.h> #include <time.h> @@ -100,10 +98,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base = 0); bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len); bool Base256ToNum(const char *Str,unsigned long long &Res,unsigned int Len); -bool Hex2Num(const std::string &Str,unsigned char *Num,unsigned int Length); -#ifdef APT_PKG_EXPOSE_STRING_VIEW -APT_HIDDEN bool Hex2Num(const APT::StringView Str,unsigned char *Num,unsigned int Length); -#endif +bool Hex2Num(const APT::StringView Str,unsigned char *Num,unsigned int Length); // input changing string split bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); |