[clang-tools-extra] r325239 - [clangd] Fix make_unique ambiguity, NFC

Sam McCall via cfe-commits cfe-commits at lists.llvm.org
Thu Feb 15 06:16:17 PST 2018


Author: sammccall
Date: Thu Feb 15 06:16:17 2018
New Revision: 325239

URL: http://llvm.org/viewvc/llvm-project?rev=325239&view=rev
Log:
[clangd] Fix make_unique ambiguity, NFC

Modified:
    clang-tools-extra/trunk/clangd/Trace.cpp

Modified: clang-tools-extra/trunk/clangd/Trace.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/Trace.cpp?rev=325239&r1=325238&r2=325239&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/Trace.cpp (original)
+++ clang-tools-extra/trunk/clangd/Trace.cpp Thu Feb 15 06:16:17 2018
@@ -50,8 +50,8 @@ public:
   // We stash a Span object in the context. It will record the start/end,
   // and this also allows us to look up the parent Span's information.
   Context beginSpan(llvm::StringRef Name, json::obj *Args) override {
-    return Context::current().derive(SpanKey,
-                                     make_unique<JSONSpan>(this, Name, Args));
+    return Context::current().derive(
+        SpanKey, llvm::make_unique<JSONSpan>(this, Name, Args));
   }
 
   // Trace viewer requires each thread to properly stack events.




More information about the cfe-commits mailing list