summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam McCall <sam.mccall@gmail.com>2018-02-15 14:16:17 +0000
committerSam McCall <sam.mccall@gmail.com>2018-02-15 14:16:17 +0000
commit892ea68a825dac2938b937d54ba926d833f01b13 (patch)
tree4a21f3b98bc0b18b360819c6e266c1740dd220d9
parent7519288e8ed672387f0c3ec6d06f2fc42b31037b (diff)
downloadbcm5719-llvm-892ea68a825dac2938b937d54ba926d833f01b13.tar.gz
bcm5719-llvm-892ea68a825dac2938b937d54ba926d833f01b13.zip
[clangd] Fix make_unique ambiguity, NFC
llvm-svn: 325239
-rw-r--r--clang-tools-extra/clangd/Trace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/Trace.cpp b/clang-tools-extra/clangd/Trace.cpp
index 3b6546c71fc..3d21e8ad153 100644
--- a/clang-tools-extra/clangd/Trace.cpp
+++ b/clang-tools-extra/clangd/Trace.cpp
@@ -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.
OpenPOWER on IntegriCloud