From 32f0295460e2c8715d2a065aaa89da66078c8e1b Mon Sep 17 00:00:00 2001 From: Sean L Date: Tue, 13 Oct 2015 14:27:57 -0400 Subject: [PATCH] Fix warning when using Intel C++ on OS X Unfortunately, Intel's C++ compiler defines `__clang__` which means that some of the pragmas in use that Intel C++ doesn't use will cause warnings to be generated. --- format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/format.h b/format.h index 36bc0109..625a0526 100644 --- a/format.h +++ b/format.h @@ -116,7 +116,7 @@ inline uint32_t clzll(uint64_t x) { # define FMT_GCC_EXTENSION #endif -#ifdef __clang__ +#if defined(__clang__) && !defined(__INTEL_COMPILER) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wdocumentation" #endif @@ -3146,7 +3146,7 @@ operator"" _a(const wchar_t *s, std::size_t) { return {s}; } # pragma GCC diagnostic pop #endif -#ifdef __clang__ +#if defined(__clang__) && !defined(__INTEL_COMPILER) # pragma clang diagnostic pop #endif