diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-11-14 14:54:40 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-11-14 14:54:40 +0000 |
| commit | 82752f6e0c65541244c2607e5dedf437701e07dc (patch) | |
| tree | 9f8a63e33e05350551919c0c6f66340820303120 /test/libapt/strutil_test.cc | |
| parent | 8f10ee850db3892bc979694864451be3a73ad1e8 (diff) | |
| parent | 36998f582e211f745799ddc2a8bc286541e56689 (diff) | |
Merge branch 'svequiv' into 'main'
Internally replace APT::StringView with std::string_view where it doesn't affect the ABI, with implementations that support both std::string_view and APT::StringView with new shims. ReportMirrorFailureToCentral: fix use-after-free
See merge request apt-team/apt!394
Diffstat (limited to 'test/libapt/strutil_test.cc')
| -rw-r--r-- | test/libapt/strutil_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc index d7e57365f..500ba98da 100644 --- a/test/libapt/strutil_test.cc +++ b/test/libapt/strutil_test.cc @@ -1,6 +1,5 @@ #include <config.h> #include <apt-pkg/fileutl.h> -#include <apt-pkg/string_view.h> #include <apt-pkg/strutl.h> #include <limits> #include <string> @@ -259,7 +258,7 @@ TEST(StrUtilTest,QuoteString) EXPECT_EQ("Eltville-Erbach", DeQuoteString(QuoteString("Eltville-Erbach", ""))); } -static void EXPECT_STRTONUM(APT::StringView const str, bool const success, unsigned long const expected, unsigned const base) +static void EXPECT_STRTONUM(std::string_view const str, bool const success, unsigned long const expected, unsigned const base) { SCOPED_TRACE(std::string(str.data(), str.length())); SCOPED_TRACE(base); |