[llvm] r346268 - Silence deprecation warning for GetVersionEx with clang-cl

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 6 13:40:32 PST 2018


Author: rnk
Date: Tue Nov  6 13:40:32 2018
New Revision: 346268

URL: http://llvm.org/viewvc/llvm-project?rev=346268&view=rev
Log:
Silence deprecation warning for GetVersionEx with clang-cl

Modified:
    llvm/trunk/lib/Support/Windows/WindowsSupport.h

Modified: llvm/trunk/lib/Support/Windows/WindowsSupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/WindowsSupport.h?rev=346268&r1=346267&r2=346268&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/WindowsSupport.h (original)
+++ llvm/trunk/lib/Support/Windows/WindowsSupport.h Tue Nov  6 13:40:32 2018
@@ -96,12 +96,19 @@ inline llvm::VersionTuple GetWindowsOSVe
 #pragma warning(push)
 #pragma warning(disable : 4996)
 #endif // _MSC_VER
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
+#endif // __clang__
   // Starting with Microsoft SDK for Windows 8.1, this function is deprecated
   // in favor of the new Windows Version Helper APIs.  Since we don't specify a
   // minimum SDK version, it's easier to simply disable the warning rather than
   // try to support both APIs.
   if (GetVersionEx((LPOSVERSIONINFO)&info) == 0)
     return llvm::VersionTuple();
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif // _MSC_VER




More information about the llvm-commits mailing list