diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 08:10:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 08:10:12 (GMT) |
| commit | 51b29b6ab448895810d2c8a5fd396e37cd89a388 (patch) | |
| tree | ed5005c1e8276bfef5c8a746860dd9f1856ae6a0 /tools | |
| parent | 8a1ca95768c7f4017372419432d370468421a617 (diff) | |
| download | hdf5-51b29b6ab448895810d2c8a5fd396e37cd89a388.zip hdf5-51b29b6ab448895810d2c8a5fd396e37cd89a388.tar.gz hdf5-51b29b6ab448895810d2c8a5fd396e37cd89a388.tar.bz2 | |
[svn-r28218] Merge of r28138, 28196, and 28204 from trunk.
hbool_t changes
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial w/ Fortran and C++
parallel (MPICH 3.1.4) w/ Fortran
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5copy/h5copygentest.c | 2 | ||||
| -rw-r--r-- | tools/misc/h5clear_gentest.c | 2 | ||||
| -rw-r--r-- | tools/perform/pio_standalone.h | 4 | ||||
| -rw-r--r-- | tools/perform/sio_standalone.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c index 45373c7..aa95c1d 100644 --- a/tools/h5copy/h5copygentest.c +++ b/tools/h5copy/h5copygentest.c @@ -649,7 +649,7 @@ static void Test_Obj_Copy(void) { hid_t fid = (-1); /* File id */ hid_t fapl_new = (-1); /* File access property id */ - hbool_t new_format; /* New format or old format */ + unsigned new_format; /* New format or old format */ if((fapl_new = H5Pcreate(H5P_FILE_ACCESS)) < 0) { fprintf(stderr, "Error: H5Pcreate failed.\n"); diff --git a/tools/misc/h5clear_gentest.c b/tools/misc/h5clear_gentest.c index ae057e5..1468432 100644 --- a/tools/misc/h5clear_gentest.c +++ b/tools/misc/h5clear_gentest.c @@ -59,7 +59,7 @@ main(void) hid_t fid; /* File ID */ hid_t fapl, new_fapl; /* File access property lists */ char fname[512]; /* File name */ - hbool_t new_format; /* To use latest library format or not */ + unsigned new_format; /* To use latest library format or not */ int fd; /* File descriptor */ uint8_t super_vers; /* Superblock version */ ssize_t bytes_written; /* The # of bytes written to the file */ diff --git a/tools/perform/pio_standalone.h b/tools/perform/pio_standalone.h index 584a057..762a564 100644 --- a/tools/perform/pio_standalone.h +++ b/tools/perform/pio_standalone.h @@ -105,10 +105,10 @@ typedef off_t h5_stat_size_t; * HDF Boolean type. */ #ifndef FALSE -# define FALSE 0 +# define FALSE false #endif #ifndef TRUE -# define TRUE 1 +# define TRUE true #endif diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h index 8f52eba..547a9ee 100644 --- a/tools/perform/sio_standalone.h +++ b/tools/perform/sio_standalone.h @@ -471,10 +471,10 @@ extern char *strdup(const char *s); * HDF Boolean type. */ #ifndef FALSE -# define FALSE 0 +# define FALSE false #endif #ifndef TRUE -# define TRUE 1 +# define TRUE true #endif /** From h5test.h **/ |