From dd58ef019b700900793a1eb48b52123db01b654e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 30 Dec 2015 11:46:15 +0000 Subject: Vendor import of llvm trunk r256633: https://llvm.org/svn/llvm-project/llvm/trunk@256633 --- unittests/Support/CommandLineTest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'unittests/Support/CommandLineTest.cpp') diff --git a/unittests/Support/CommandLineTest.cpp b/unittests/Support/CommandLineTest.cpp index e0fbf5b09e57..eac669f467b7 100644 --- a/unittests/Support/CommandLineTest.cpp +++ b/unittests/Support/CommandLineTest.cpp @@ -94,16 +94,16 @@ TEST(CommandLineTest, ModifyExisitingOption) { "Failed to modify option's option category."; Retrieved->setDescription(Description); - ASSERT_STREQ(Retrieved->HelpStr, Description) << - "Changing option description failed."; + ASSERT_STREQ(Retrieved->HelpStr.data(), Description) + << "Changing option description failed."; Retrieved->setArgStr(ArgString); - ASSERT_STREQ(ArgString, Retrieved->ArgStr) << - "Failed to modify option's Argument string."; + ASSERT_STREQ(ArgString, Retrieved->ArgStr.data()) + << "Failed to modify option's Argument string."; Retrieved->setValueStr(ValueString); - ASSERT_STREQ(Retrieved->ValueStr, ValueString) << - "Failed to modify option's Value string."; + ASSERT_STREQ(Retrieved->ValueStr.data(), ValueString) + << "Failed to modify option's Value string."; Retrieved->setHiddenFlag(cl::Hidden); ASSERT_EQ(cl::Hidden, TestOption.getOptionHiddenFlag()) << @@ -155,7 +155,7 @@ void testCommandLineTokenizer(ParserFunction *parse, const char *Input, const char *const Output[], size_t OutputSize) { SmallVector Actual; BumpPtrAllocator A; - BumpPtrStringSaver Saver(A); + StringSaver Saver(A); parse(Input, Saver, Actual, /*MarkEOLs=*/false); EXPECT_EQ(OutputSize, Actual.size()); for (unsigned I = 0, E = Actual.size(); I != E; ++I) { -- cgit v1.2.3