summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-07-18 05:40:06 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-07-18 05:40:06 (GMT)
commit94a6e02b3dfde5a226b124177c33526080d6bb86 (patch)
tree4e27e41f7437c18798faf41201fe62c9e31c50e4 /tools
parent12b86abf18d831a2eeb337146187e220a50fafb2 (diff)
downloadhdf5-94a6e02b3dfde5a226b124177c33526080d6bb86.zip
hdf5-94a6e02b3dfde5a226b124177c33526080d6bb86.tar.gz
hdf5-94a6e02b3dfde5a226b124177c33526080d6bb86.tar.bz2
[svn-r27407] Updated the H5_ATTR_* macros.
- Updated the preprocessor logic that defines the H5_ATTR_* macros. The Solaris Studio compiler understands __attribute__ but not the specific attributes that we use. The H5_ATTR_* macros are now defined as blank with that compiler which significantly cleans up the warnings, making debugging easier. - Replaced a few lingering __attribute__ macros with H5_ATTR_* markup. Tested on: h5committest Solaris w/ Solaris Studio (emu)
Diffstat (limited to 'tools')
-rw-r--r--tools/perform/chunk.c4
-rw-r--r--tools/perform/overhead.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c
index 625809a..74bcc46 100644
--- a/tools/perform/chunk.c
+++ b/tools/perform/chunk.c
@@ -33,8 +33,8 @@
# include <string.h>
#endif
-
-#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus
+/* Solaris Studio defines attribute, but for the attributes we need */
+#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus || defined(__SUNPRO_C)
# undef __attribute__
# define __attribute__(X) /*void*/
# define H5_ATTR_UNUSED /*void*/
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index 0e9166c..0288ffa 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -46,7 +46,8 @@
# include <io.h>
#endif
-#ifndef H5_HAVE_ATTRIBUTE
+/* Solaris Studio defines attribute, but for the attributes we need */
+#if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus || defined(__SUNPRO_C)
# undef __attribute__
# define __attribute__(X) /*void*/
# define H5_ATTR_UNUSED /*void*/