diff options
| author | Jan Korous <jkorous@apple.com> | 2018-11-28 10:24:07 +0000 |
|---|---|---|
| committer | Jan Korous <jkorous@apple.com> | 2018-11-28 10:24:07 +0000 |
| commit | 613c80d22f2428fb7e70754340c6a515e8e8d9c9 (patch) | |
| tree | 9ddc47e912678a5e01cf84281d9f8ca9bf7a2f60 /clang-tools-extra/clangd/Protocol.cpp | |
| parent | d7ef7ff5b204de088e89b902f83b01179b4c08bf (diff) | |
| download | bcm5719-llvm-613c80d22f2428fb7e70754340c6a515e8e8d9c9.tar.gz bcm5719-llvm-613c80d22f2428fb7e70754340c6a515e8e8d9c9.zip | |
[clangd] Fix backward-compatibility - follow-up to textDocument/SymbolInfo
Apparently clang 3.6 couldn't build the preceding patch.
llvm-svn: 347738
Diffstat (limited to 'clang-tools-extra/clangd/Protocol.cpp')
| -rw-r--r-- | clang-tools-extra/clangd/Protocol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp index 1cc6b16b34a..7687693f62c 100644 --- a/clang-tools-extra/clangd/Protocol.cpp +++ b/clang-tools-extra/clangd/Protocol.cpp @@ -453,7 +453,8 @@ llvm::json::Value toJSON(const SymbolDetails &P) { if (P.ID.hasValue()) result["id"] = P.ID.getValue().str(); - return result; + // Older clang cannot compile 'return Result', even though it is legal. + return json::Value(std::move(result)); } llvm::raw_ostream &operator<<(llvm::raw_ostream &O, const SymbolDetails &S) { |
