diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-11 16:20:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-01-11 16:20:14 (GMT) |
| commit | 9821924d45e0a9a22e8366060f41d6d87c26622f (patch) | |
| tree | 3b79925255bbf16f234485644538676b74a5267b /Source/kwsys/ProcessUNIX.c | |
| parent | cedbb7994dddce2c3fdf846bf4563c846adf4632 (diff) | |
| parent | 8e7356a2921c769c091c52140564b04108e692c4 (diff) | |
| download | CMake-9821924d45e0a9a22e8366060f41d6d87c26622f.zip CMake-9821924d45e0a9a22e8366060f41d6d87c26622f.tar.gz CMake-9821924d45e0a9a22e8366060f41d6d87c26622f.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-01-11 (e8bf616e)
Diffstat (limited to 'Source/kwsys/ProcessUNIX.c')
| -rw-r--r-- | Source/kwsys/ProcessUNIX.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c index b0ddf5a..07c644b 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c @@ -1595,12 +1595,12 @@ static void kwsysProcessVolatileFree(volatile void* p) { /* clang has made it impossible to free memory that points to volatile without first using special pragmas to disable a warning... */ -#if defined(__clang__) +#if defined(__clang__) && !defined(__INTEL_COMPILER) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wcast-qual" #endif free((void*)p); /* The cast will silence most compilers, but not clang. */ -#if defined(__clang__) +#if defined(__clang__) && !defined(__INTEL_COMPILER) # pragma clang diagnostic pop #endif } |