From c2055486eb7577f941bf8a219188c733c3f2cf18 Mon Sep 17 00:00:00 2001
From: Sam McCall <sam.mccall@gmail.com>
Date: Tue, 7 Nov 2017 08:57:54 +0000
Subject: [PATCH] [clangd] fix MSVC build errors

llvm-svn: 317553
---
 clang-tools-extra/clangd/JSONExpr.cpp | 2 +-
 clang-tools-extra/clangd/JSONExpr.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang-tools-extra/clangd/JSONExpr.cpp b/clang-tools-extra/clangd/JSONExpr.cpp
index 91a76cd..968892c 100644
--- a/clang-tools-extra/clangd/JSONExpr.cpp
+++ b/clang-tools-extra/clangd/JSONExpr.cpp
@@ -2,10 +2,10 @@
 
 #include "llvm/Support/Format.h"
 
+using namespace llvm;
 namespace clang {
 namespace clangd {
 namespace json {
-using namespace llvm;
 
 void Expr::copyFrom(const Expr &M) {
   Type = M.Type;
diff --git a/clang-tools-extra/clangd/JSONExpr.h b/clang-tools-extra/clangd/JSONExpr.h
index 90ff31a..b9cf808 100644
--- a/clang-tools-extra/clangd/JSONExpr.h
+++ b/clang-tools-extra/clangd/JSONExpr.h
@@ -154,7 +154,7 @@ public:
     ObjectKey(const llvm::formatv_object_base &V) : ObjectKey(V.str()) {}
 
     ObjectKey(const ObjectKey &C) { *this = C; }
-    ObjectKey(ObjectKey &&C) = default;
+    ObjectKey(ObjectKey &&C) : ObjectKey(static_cast<const ObjectKey &&>(C)) {}
     ObjectKey &operator=(const ObjectKey &C) {
       if (C.Owned) {
         Owned.reset(new std::string(*C.Owned));
-- 
2.7.4