[clang-tools-extra] r317553 - [clangd] fix MSVC build errors

[Galina Kistanova via cfe-commits]

Hello Sam,

It looks like this commit broke the builder:
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/13313

. . .
FAILED:
tools/clang/tools/extra/unittests/clangd/CMakeFiles/ClangdTests.dir/JSONExprTests.cpp.obj

Please have a look?

Thanks

Galina


On Tue, Nov 7, 2017 at 12:57 AM, Sam McCall via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: sammccall
> Date: Tue Nov  7 00:57:54 2017
> New Revision: 317553
>
> URL: http://llvm.org/viewvc/llvm-project?rev=317553&view=rev
> Log:
> [clangd] fix MSVC build errors
>
> Modified:
>     clang-tools-extra/trunk/clangd/JSONExpr.cpp
>     clang-tools-extra/trunk/clangd/JSONExpr.h
>
> Modified: clang-tools-extra/trunk/clangd/JSONExpr.cpp
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/
> trunk/clangd/JSONExpr.cpp?rev=317553&r1=317552&r2=317553&view=diff
> ============================================================
> ==================
> --- clang-tools-extra/trunk/clangd/JSONExpr.cpp (original)
> +++ clang-tools-extra/trunk/clangd/JSONExpr.cpp Tue Nov  7 00:57:54 2017
> @@ -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;
>
> Modified: clang-tools-extra/trunk/clangd/JSONExpr.h
> URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/
> trunk/clangd/JSONExpr.h?rev=317553&r1=317552&r2=317553&view=diff
> ============================================================
> ==================
> --- clang-tools-extra/trunk/clangd/JSONExpr.h (original)
> +++ clang-tools-extra/trunk/clangd/JSONExpr.h Tue Nov  7 00:57:54 2017
> @@ -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));
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171107/4b21a45b/attachment.html>