diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:02:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2009-02-18 20:02:05 (GMT) |
| commit | 5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c (patch) | |
| tree | 6bfe2263c050603e228fb929ad236a5069c11fae /tools/h5diff | |
| parent | 85dc39846e418b7abd0e0b951f52d474a82eac80 (diff) | |
| download | hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.zip hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.gz hdf5-5d69e87ff0f4a4c3ce72b69a944b73b46b5c2b7c.tar.bz2 | |
[svn-r16489] Fixed bug #1459 by eliminating the macro long_long and replacing all instances with long long.
Tested:
h5comittest
fedora 10 x64
Vista 32, VS2005, IVF101
XP32, Cygwin
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/h5diffgentest.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 141c96f..d9495e5 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -43,7 +43,7 @@ #define FILE11 "h5diff_empty.h5" #define UIMAX 4294967295u /*Maximum value for a variable of type unsigned int */ #define STR_SIZE 3 -#define GBLL ((unsigned long_long) 1024 * 1024 *1024 ) +#define GBLL ((unsigned long long) 1024 * 1024 *1024 ) #define MY_LINKCLASS 187 @@ -202,12 +202,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3) /*------------------------------------------------------------------------- * relative error, compare divide by zero, both zero - * # 1.6.2 with -p (unsigned long_long) + * # 1.6.2 with -p (unsigned long long) *------------------------------------------------------------------------- */ { - unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}}; - unsigned long_long data8[3][2] = {{120,80}, {0,100},{0,50}}; + unsigned long long data7[3][2] = {{100,100},{100,0},{0,100}}; + unsigned long long data8[3][2] = {{120,80}, {0,100},{0,50}}; write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7); write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8); @@ -575,11 +575,11 @@ int test_datatypes(const char *fname) char buf7a[3][2] = {{-1,-128},{-1,-1},{-1,-1}}; unsigned char buf7b[3][2] = {{1,128},{1,1},{1,1}}; - /* long_long test */ - long_long buf8a[3][2] = {{1,1},{1,1},{1,1}}; - long_long buf8b[3][2] = {{1,1},{3,4},{5,6}}; - unsigned long_long buf9a[3][2] = {{1,1},{1,1},{1,1}}; - unsigned long_long buf9b[3][2] = {{1,1},{3,4},{5,6}}; + /* long long test */ + long long buf8a[3][2] = {{1,1},{1,1},{1,1}}; + long long buf8b[3][2] = {{1,1},{3,4},{5,6}}; + unsigned long long buf9a[3][2] = {{1,1},{1,1},{1,1}}; + unsigned long long buf9b[3][2] = {{1,1},{3,4},{5,6}}; unsigned int buf10a[3][2] = {{UIMAX,1},{1,1},{1,1}}; unsigned int buf10b[3][2] = {{UIMAX-1,1},{3,4},{5,6}}; |