[llvm-branch-commits] [clang-tools-extra-branch] r292834 - Merging r291892:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Jan 23 16:06:11 2017
New Revision: 292834

URL: http://llvm.org/viewvc/llvm-project?rev=292834&view=rev
Log:
Merging r291892:
------------------------------------------------------------------------
r291892 | d0k | 2017-01-13 02:14:07 -0800 (Fri, 13 Jan 2017) | 7 lines

Fix the build of the include-fixer plugin for some shared cmake builds and MSVC.

- The include fixer plugin does not directly depend on pthread, but can
pick up pthread references transitively through inlining. Just add
pthreads to the linked libs unconditionally.
- MSVC emits bogus warnings when including <future> and building without
exceptions. Blacklist the warnings explicitly.
------------------------------------------------------------------------

Modified:
    clang-tools-extra/branches/release_40/   (props changed)
    clang-tools-extra/branches/release_40/include-fixer/SymbolIndexManager.h
    clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt

Propchange: clang-tools-extra/branches/release_40/
------------------------------------------------------------------------------
    svn:mergeinfo = /clang-tools-extra/trunk:291892

Modified: clang-tools-extra/branches/release_40/include-fixer/SymbolIndexManager.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_40/include-fixer/SymbolIndexManager.h?rev=292834&r1=292833&r2=292834&view=diff
==============================================================================
--- clang-tools-extra/branches/release_40/include-fixer/SymbolIndexManager.h (original)
+++ clang-tools-extra/branches/release_40/include-fixer/SymbolIndexManager.h Mon Jan 23 16:06:11 2017
@@ -13,8 +13,19 @@
 #include "SymbolIndex.h"
 #include "find-all-symbols/SymbolInfo.h"
 #include "llvm/ADT/StringRef.h"
+
+#ifdef _MSC_VER
+// Disable warnings from ppltasks.h transitively included by <future>.
+#pragma warning(push)
+#pragma warning(disable:4530)
+#endif
+
 #include <future>
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 namespace clang {
 namespace include_fixer {
 

Modified: clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt?rev=292834&r1=292833&r2=292834&view=diff
==============================================================================
--- clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt (original)
+++ clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt Mon Jan 23 16:06:11 2017
@@ -9,4 +9,5 @@ add_clang_library(clangIncludeFixerPlugi
   clangParse
   clangSema
   clangTooling
+  ${PTHREAD_LIB}
   )