[clang-tools-extra] 95cb22d - Fix xpc build after 777180a32b6107
Nico Weber via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 28 16:35:24 PST 2020
Author: Nico Weber
Date: 2020-01-28T19:35:11-05:00
New Revision: 95cb22d0f9f3b01703f01baacec3ea6c6d5df22b
URL: https://github.com/llvm/llvm-project/commit/95cb22d0f9f3b01703f01baacec3ea6c6d5df22b
DIFF: https://github.com/llvm/llvm-project/commit/95cb22d0f9f3b01703f01baacec3ea6c6d5df22b.diff
LOG: Fix xpc build after 777180a32b6107
Added:
Modified:
clang-tools-extra/clangd/xpc/XPCTransport.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clangd/xpc/XPCTransport.cpp b/clang-tools-extra/clangd/xpc/XPCTransport.cpp
index dd4bb7028da9..02c1b083701e 100644
--- a/clang-tools-extra/clangd/xpc/XPCTransport.cpp
+++ b/clang-tools-extra/clangd/xpc/XPCTransport.cpp
@@ -37,7 +37,8 @@ json::Object encodeError(Error E) {
}
Error decodeError(const json::Object &O) {
- std::string Msg = O.getString("message").getValueOr("Unspecified error");
+ std::string Msg =
+ std::string(O.getString("message").getValueOr("Unspecified error"));
if (auto Code = O.getInteger("code"))
return make_error<LSPError>(std::move(Msg), ErrorCode(*Code));
return make_error<StringError>(std::move(Msg), inconvertibleErrorCode());
More information about the cfe-commits
mailing list