[MOAB-dev] r1335 - MOAB/trunk

[Jason Kraftcheck]

dcthomp at mcs.anl.gov wrote:
> Author: dcthomp
> Date: 2007-10-24 15:58:58 -0500 (Wed, 24 Oct 2007)
> New Revision: 1335
> 
> Modified:
>    MOAB/trunk/MBEntityHandle.h.in
>    MOAB/trunk/config.h.cmake
> Log:
> COMP: Eliminate "HDF5_FILE redefined" warnings.
> 
> 
> Modified: MOAB/trunk/MBEntityHandle.h.in
> ===================================================================
> --- MOAB/trunk/MBEntityHandle.h.in	2007-10-24 20:38:48 UTC (rev 1334)
> +++ MOAB/trunk/MBEntityHandle.h.in	2007-10-24 20:58:58 UTC (rev 1335)
> @@ -12,7 +12,7 @@
>  #ifdef HDF5_FOUND
>  #  define HAVE_HDF5_H
>  #endif
> -#ifdef HAVE_HDF5_H
> +#if defined(HAVE_HDF5_H) && !defined(HDF5_FILE)
>  #  define HDF5_FILE
>  #endif
>  

Why did you add HDF5-related defines to MBEntityHandle.h.in?  The
MBEntityHandle header has nothing to do with HDF5 files.

> 
> Modified: MOAB/trunk/config.h.cmake
> ===================================================================
> --- MOAB/trunk/config.h.cmake	2007-10-24 20:38:48 UTC (rev 1334)
> +++ MOAB/trunk/config.h.cmake	2007-10-24 20:58:58 UTC (rev 1335)
> @@ -105,7 +105,9 @@
>  #cmakedefine HDF5_FOUND
>  #ifdef HDF5_FOUND
>  #  define HAVE_HDF5_H
> -#  define HDF5_FILE
> +#  ifndef HDF5_FILE
> +#    define HDF5_FILE
> +#  endif /* HDF5_FILE */
>  #endif /* HDF5_FOUND */
>  

I don't think we use config.h anywhere (it will probably break
applications if ever used in a MOAB header anyway.)  Tools like automake
and autoreconf insist on generating at least one such header automatically
using autoheader, so we just let it generate the header and never use it.

- jason