[llvm] r312604 - Fix crbug 759265 by suppressing llvm mt warnings.

[Eric Beckmann via llvm-commits]

Author: ecbeckmann
Date: Tue Sep  5 18:50:36 2017
New Revision: 312604

URL: http://llvm.org/viewvc/llvm-project?rev=312604&view=rev
Log:
Fix crbug 759265 by suppressing llvm mt warnings.

Summary:
Previous would throw warning whenever libxml2 is not installed.  Now
only give this warning if merging manifest fails.

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D37240

Modified:
    llvm/trunk/include/llvm/WindowsManifest/WindowsManifestMerger.h
    llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp

Modified: llvm/trunk/include/llvm/WindowsManifest/WindowsManifestMerger.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/WindowsManifest/WindowsManifestMerger.h?rev=312604&r1=312603&r2=312604&view=diff
==============================================================================
--- llvm/trunk/include/llvm/WindowsManifest/WindowsManifestMerger.h (original)
+++ llvm/trunk/include/llvm/WindowsManifest/WindowsManifestMerger.h Tue Sep  5 18:50:36 2017
@@ -35,6 +35,8 @@ class MemoryBuffer;
 
 namespace windows_manifest {
 
+bool isAvailable();
+
 class WindowsManifestError : public ErrorInfo<WindowsManifestError, ECError> {
 public:
   static char ID;

Modified: llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp?rev=312604&r1=312603&r2=312604&view=diff
==============================================================================
--- llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp (original)
+++ llvm/trunk/lib/WindowsManifest/WindowsManifestMerger.cpp Tue Sep  5 18:50:36 2017
@@ -682,6 +682,8 @@ WindowsManifestMerger::WindowsManifestMe
                     : nullptr;
 }
 
+bool windows_manifest::isAvailable() { return true; }
+
 #else
 
 WindowsManifestMerger::WindowsManifestMergerImpl::~WindowsManifestMergerImpl() {
@@ -697,6 +699,8 @@ WindowsManifestMerger::WindowsManifestMe
   return nullptr;
 }
 
+bool windows_manifest::isAvailable() { return false; }
+
 #endif
 
 WindowsManifestMerger::WindowsManifestMerger()