diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-07-20 17:41:09 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-07-20 17:41:09 (GMT) |
| commit | f06ac194886cfa7b491bd6f40379a42fee4bea50 (patch) | |
| tree | a10d6add49e6712ee36d516cb1c9f76c2cc411c7 | |
| parent | 3ba44a43f51b1b837d7fee5de9edb050cde3caab (diff) | |
| download | hdf5-f06ac194886cfa7b491bd6f40379a42fee4bea50.zip hdf5-f06ac194886cfa7b491bd6f40379a42fee4bea50.tar.gz hdf5-f06ac194886cfa7b491bd6f40379a42fee4bea50.tar.bz2 | |
[svn-r4246] Purpose:
Code cleanup
Description:
Don't include code in H5pubconf.h to undef inline.
Platforms tested:
FreeBSD 4.3 (hawkwind)
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 15 |
2 files changed, 2 insertions, 24 deletions
@@ -10473,14 +10473,3 @@ cat >> src/H5config.h <<EOF #endif EOF -if (grep __cplusplus src H5pubconf.h) >/dev/null 2>&1; then - : -else - cat >> src/H5pubconf.h <<EOF - -/* inline is a keyword in C++. If this is a C++ compiler, undefine it */ -#if defined(__cplusplus) && defined(inline) -#undef inline -#endif -EOF -fi diff --git a/configure.in b/configure.in index 67bff1f..0b40d41 100644 --- a/configure.in +++ b/configure.in @@ -1657,6 +1657,8 @@ touch ./config/stamp2 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 dnl We don't want inline defined for C++ compilers +dnl Don't worry about the C++ ifdef wrappers in the H5pubconf file, since +dnl 'H5_inline' isn't a C++ keyword. cat >> src/H5config.h <<EOF /* inline is a keyword in C++. If this is a C++ compiler, undefine it */ @@ -1665,16 +1667,3 @@ cat >> src/H5config.h <<EOF #endif EOF -dnl Put the C++ ifdef wrappers in the H5pubconf file as well, but only -dnl if it's not there already. -if (grep __cplusplus src H5pubconf.h) >/dev/null 2>&1; then - : -else - cat >> src/H5pubconf.h <<EOF - -/* inline is a keyword in C++. If this is a C++ compiler, undefine it */ -#if defined(__cplusplus) && defined(inline) -#undef inline -#endif -EOF -fi |