summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2019-08-13 15:36:55 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2019-08-13 15:36:55 (GMT)
commit60b62b10f1acbee14f6ec90d85922b8fefb0eeb4 (patch)
treeaf9cdd9f4aa9a7ed13f392ccb0e056504391b2f9 /src
parente874070dbb27994b24860f94ffc53ca1b12211fa (diff)
parentdf7ce9a5c933315af34dd402cfb2ca394003b56b (diff)
downloadhdf5-60b62b10f1acbee14f6ec90d85922b8fefb0eeb4.zip
hdf5-60b62b10f1acbee14f6ec90d85922b8fefb0eeb4.tar.gz
hdf5-60b62b10f1acbee14f6ec90d85922b8fefb0eeb4.tar.bz2
Merge pull request #1861 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'df7ce9a5c933315af34dd402cfb2ca394003b56b': Added ifdef for intel compilers, __GNUC__ has to be defined for header files which use it to work with intel compilers. This gives a warning for intel compiler about fallthrough, so added a check not to include fallthrough if using intel compilers.
Diffstat (limited to 'src')
-rw-r--r--src/H5private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5private.h b/src/H5private.h
index 00b7a07..a897fb9 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -317,7 +317,7 @@
# define H5_ATTR_NORETURN __attribute__((noreturn))
# define H5_ATTR_CONST __attribute__((const))
# define H5_ATTR_PURE __attribute__((pure))
-#if defined(__GNUC__) && __GNUC__ >= 7
+#if defined(__GNUC__) && __GNUC__ >= 7 && !defined(__INTEL_COMPILER)
# define H5_ATTR_FALLTHROUGH __attribute__((fallthrough));
#else
# define H5_ATTR_FALLTHROUGH /*void*/