diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-07-18 14:25:25 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-07-18 14:25:25 (GMT) |
| commit | 6cf0ff17c2b9caa8b79ae89d98ac90e229515e6b (patch) | |
| tree | 05e5d4990b33d37ff25869fbce13ec551d51e33c /tools | |
| parent | 8be9d9a7e8e60f9923b368ce056ea7c69b9007e0 (diff) | |
| download | hdf5-6cf0ff17c2b9caa8b79ae89d98ac90e229515e6b.zip hdf5-6cf0ff17c2b9caa8b79ae89d98ac90e229515e6b.tar.gz hdf5-6cf0ff17c2b9caa8b79ae89d98ac90e229515e6b.tar.bz2 | |
[svn-r27408] Merge of r27407 from the trunk.
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: jam (passes)
emu (behaves correctly, but flock issues prevent building in this
branch)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perform/chunk.c | 4 | ||||
| -rw-r--r-- | tools/perform/overhead.c | 3 |
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*/ |