diff options
| author | Pavel Labath <pavel@labath.sk> | 2019-08-26 12:42:32 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2019-08-26 12:42:32 +0000 |
| commit | f899bf135fc5b7bb030b90da686d9d89bb97d18f (patch) | |
| tree | ff52b4ba6972859d0823ab06001234924e9cf912 | |
| parent | 27f56c1200aa78e3b651cb8ff913b7b727211d8d (diff) | |
| download | llvm-f899bf135fc5b7bb030b90da686d9d89bb97d18f.zip llvm-f899bf135fc5b7bb030b90da686d9d89bb97d18f.tar.gz llvm-f899bf135fc5b7bb030b90da686d9d89bb97d18f.tar.bz2 | |
Fix windows build after r369894
Constructing a std::vector from a llvm::map_range fails on windows,
apparently because std::vector expects the input iterator to have a
const operator* (map_range iterator has a non-const one).
This avoids the cleverness and unrolls the map-loop manually (which is
also slightly shorter).
llvm-svn: 369905
| -rw-r--r-- | lldb/unittests/Symbol/PostfixExpressionTest.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lldb/unittests/Symbol/PostfixExpressionTest.cpp b/lldb/unittests/Symbol/PostfixExpressionTest.cpp index e9f7819..b7fa73c 100644 --- a/lldb/unittests/Symbol/PostfixExpressionTest.cpp +++ b/lldb/unittests/Symbol/PostfixExpressionTest.cpp @@ -108,12 +108,10 @@ ParseFPOAndStringify(llvm::StringRef prog) { llvm::BumpPtrAllocator alloc; std::vector<std::pair<llvm::StringRef, Node *>> parsed = ParseFPOProgram(prog, alloc); - auto range = llvm::map_range( - parsed, [](const std::pair<llvm::StringRef, Node *> &pair) { - return std::make_pair(pair.first, ASTPrinter::Print(pair.second)); - }); - return std::vector<std::pair<std::string, std::string>>(range.begin(), - range.end()); + std::vector<std::pair<std::string, std::string>> result; + for (const auto &p : parsed) + result.emplace_back(p.first, ASTPrinter::Print(p.second)); + return result; } TEST(PostfixExpression, ParseFPOProgram) { |
