From 288a8e1e8045a9909696a9bc404a18e52e82d01d Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 8 Mar 2019 07:52:29 -0800 Subject: [PATCH] Fix ICC warnings Change-Id: I5170eacf9ac7590d2d72dbb1dac3316a1b2e8ab0 --- src/external/tinyxml2/tinyxml2.cpp | 2 +- src/external/tng_io/external/zlib/inflate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/external/tinyxml2/tinyxml2.cpp b/src/external/tinyxml2/tinyxml2.cpp index e53ac5691c..aa67b48ddd 100755 --- a/src/external/tinyxml2/tinyxml2.cpp +++ b/src/external/tinyxml2/tinyxml2.cpp @@ -30,7 +30,7 @@ distribution. # include #endif -#if defined(__GNUC__) && __GNUC__>=7 +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && __GNUC__>=7 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #endif diff --git a/src/external/tng_io/external/zlib/inflate.c b/src/external/tng_io/external/zlib/inflate.c index 09ee0bcadd..d51f4646e1 100644 --- a/src/external/tng_io/external/zlib/inflate.c +++ b/src/external/tng_io/external/zlib/inflate.c @@ -91,7 +91,7 @@ # endif #endif -#if defined(__GNUC__) && __GNUC__>=7 +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && __GNUC__>=7 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #endif -- 2.22.0