diff options
author | Brad King <brad.king@kitware.com> | 2020-03-26 13:15:02 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-26 13:15:41 (GMT) |
commit | 577fc3ef1942fd11791a4b6cd557b6da32daa5d6 (patch) | |
tree | 4ebc154a8be482113f395343df34adb208a238b1 /Tests | |
parent | 607e790f4b627637a1884af4fc150afa0675c152 (diff) | |
parent | ec7928ef266599f1de08b30da84a42d7da3fd6a0 (diff) | |
download | CMake-577fc3ef1942fd11791a4b6cd557b6da32daa5d6.zip CMake-577fc3ef1942fd11791a4b6cd557b6da32daa5d6.tar.gz CMake-577fc3ef1942fd11791a4b6cd557b6da32daa5d6.tar.bz2 |
Merge topic 'string-prefix'
ec7928ef26 use _s to construct static string_views at several places
94de927cab VS10Generator: avoid many string allocations
8ca2504a4d use string_views to avoid memory allocations
761f1adcae check for a valid URL scheme before starting to do any splitting
ef778d77e0 replace std::string::substr() with operations that do not allocate memory
77616f4681 pass cm::string_view to cmVisualStudioSlnParser::ParseTag()
ada6a3226f use cm::string_view for language extension lookups
48adc29721 replace "std::string::find(x) == 0" with cmHasPrefix()
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4501
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp index ba77679..dcaa4f2 100644 --- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp +++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp @@ -32,14 +32,14 @@ void compare(const char* refName, const char* testName) // trailing null to the string that we need to strip before testing for a // trailing space. if (refLine.size() && refLine[refLine.size() - 1] == 0) { - refLine = refLine.substr(0, refLine.size() - 1); + refLine.resize(refLine.size() - 1); } if (testLine.size() && testLine[testLine.size() - 1] == 0) { - testLine = testLine.substr(0, testLine.size() - 1); + testLine.resize(testLine.size() - 1); } // The reference files never have trailing spaces: if (testLine.size() && testLine[testLine.size() - 1] == ' ') { - testLine = testLine.substr(0, testLine.size() - 1); + testLine.resize(testLine.size() - 1); } if (refLine != testLine) { std::cout << "Ref and test are not the same:\n Ref: \"" << refLine |