[clang-tools-extra] r321086 - [clangd] Fix warnings/compiler pickiness after r321083

[Sam McCall via cfe-commits]

Author: sammccall
Date: Tue Dec 19 09:05:00 2017
New Revision: 321086

URL: http://llvm.org/viewvc/llvm-project?rev=321086&view=rev
Log:
[clangd] Fix warnings/compiler pickiness after r321083

Modified:
    clang-tools-extra/trunk/clangd/CodeComplete.cpp
    clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp

Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CodeComplete.cpp?rev=321086&r1=321085&r2=321086&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/CodeComplete.cpp (original)
+++ clang-tools-extra/trunk/clangd/CodeComplete.cpp Tue Dec 19 09:05:00 2017
@@ -784,7 +784,7 @@ SpecifiedScope extraCompletionScope(Sema
     DeclContext *DC = S.computeDeclContext(SS);
     if (auto *NS = llvm::dyn_cast<NamespaceDecl>(DC)) {
       Info.Resolved = NS->getQualifiedNameAsString();
-    } else if (auto *TU = llvm::dyn_cast<TranslationUnitDecl>(DC)) {
+    } else if (llvm::dyn_cast<TranslationUnitDecl>(DC) != nullptr) {
       Info.Resolved = "::";
       // Sema does not include the suffix "::" in the range of SS, so we add
       // it back here.

Modified: clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp?rev=321086&r1=321085&r2=321086&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp (original)
+++ clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Tue Dec 19 09:05:00 2017
@@ -488,7 +488,7 @@ std::unique_ptr<SymbolIndex> simpleIndex
   auto S = std::shared_ptr<std::vector<const Symbol *>>(std::move(Snap),
                                                         &Snap->Pointers);
   I->build(std::move(S));
-  return I;
+  return std::move(I);
 }
 
 TEST(CompletionTest, NoIndex) {