diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-17 16:39:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-17 16:39:17 (GMT) |
| commit | 8f62cb43da04d46735384197f0bdb8a3dcf05df8 (patch) | |
| tree | bee4efc19f5c022f532af8905861071e641a8058 | |
| parent | cd7b4b8b90adc487f9cd4ee05f2425eeb5f7f84d (diff) | |
| download | hdf5-8f62cb43da04d46735384197f0bdb8a3dcf05df8.zip hdf5-8f62cb43da04d46735384197f0bdb8a3dcf05df8.tar.gz hdf5-8f62cb43da04d46735384197f0bdb8a3dcf05df8.tar.bz2 | |
[svn-r7967] Purpose:
Code cleanup for VS.NET
Description:
Clean up several issues that VS.NET was having problems with.
Platforms tested:
Eyeballed against Kent's bug reports.
| -rw-r--r-- | src/H5FDmulti.c | 6 | ||||
| -rw-r--r-- | test/dtypes.c | 16 | ||||
| -rw-r--r-- | test/tfile.c | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index d16421e..07cd229 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1894,9 +1894,9 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing) if (HADDR_UNDEF!=file->memb_addr[mt]) { haddr_t eoa = H5FDget_eoa(file->memb[mt]); fprintf(stderr, " %6d %20llu %20llu %20llu %s\n", - (int)mt, (unsigned long long)(file->memb_addr[mt]), - (unsigned long long)eoa, - (unsigned long long)(file->memb_next[mt]), + (int)mt, (unsigned long_long)(file->memb_addr[mt]), + (unsigned long_long)eoa, + (unsigned long_long)(file->memb_next[mt]), file->memb_name[mt]); } } diff --git a/test/dtypes.c b/test/dtypes.c index f8473f6..9577455 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -4388,15 +4388,15 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst) switch (src_type) { case FLT_FLOAT: memcpy(aligned, saved+j*sizeof(float), sizeof(float)); - hw_llong = (long long)(*((float*)aligned)); + hw_llong = (long_long)(*((float*)aligned)); break; case FLT_DOUBLE: memcpy(aligned, saved+j*sizeof(double), sizeof(double)); - hw_llong = (long long)(*((double*)aligned)); + hw_llong = (long_long)(*((double*)aligned)); break; case FLT_LDOUBLE: memcpy(aligned, saved+j*sizeof(long double), sizeof(double)); - hw_llong = (long long)(*((long double*)aligned)); + hw_llong = (long_long)(*((long double*)aligned)); break; default: break; @@ -4406,15 +4406,15 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst) switch (src_type) { case FLT_FLOAT: memcpy(aligned, saved+j*sizeof(float), sizeof(float)); - hw_ullong = (unsigned long long)(*((float*)aligned)); + hw_ullong = (unsigned long_long)(*((float*)aligned)); break; case FLT_DOUBLE: memcpy(aligned, saved+j*sizeof(double), sizeof(double)); - hw_ullong = (unsigned long long)(*((double*)aligned)); + hw_ullong = (unsigned long_long)(*((double*)aligned)); break; case FLT_LDOUBLE: memcpy(aligned, saved+j*sizeof(long double), sizeof(double)); - hw_ullong = (unsigned long long)(*((long double*)aligned)); + hw_ullong = (unsigned long_long)(*((long double*)aligned)); break; default: break; @@ -4675,10 +4675,10 @@ test_conv_int_float(const char *name, hid_t src, hid_t dst) printf(" %29lu\n", *((unsigned long*)hw)); break; case INT_LLONG: - printf(" %29ld\n", *((long long*)hw)); + printf(" %29ld\n", *((long_long*)hw)); break; case INT_ULLONG: - printf(" %29ld\n", *((unsigned long long*)hw)); + printf(" %29ld\n", *((unsigned long_long*)hw)); break; case FLT_FLOAT: printf(" %29f\n", *((float*)hw)); diff --git a/test/tfile.c b/test/tfile.c index 63815d6..6799968 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -53,7 +53,7 @@ #define F3_SYM_INTERN_K F2_SYM_INTERN_K #define FILE3 "tfile3.h5" -#define GROUP_NAME "/group" +#define GRP_NAME "/group" #define DSET_NAME "dataset" #define ATTR_NAME "attr" #define TYPE_NAME "type" @@ -848,7 +848,7 @@ test_get_file_id(void) /* Create a group in the file. Make a duplicated file ID from the group. * And close this duplicated ID */ - group_id = H5Gcreate(fid, GROUP_NAME, 0); + group_id = H5Gcreate(fid, GRP_NAME, 0); CHECK(group_id, FAIL, "H5Gcreate"); /* Test H5Iget_file_id() */ @@ -868,7 +868,7 @@ test_get_file_id(void) fid = H5Fopen(FILE4, H5F_ACC_RDWR, H5P_DEFAULT); CHECK(fid, FAIL, "H5Fcreate"); - group_id = H5Gopen(fid, GROUP_NAME); + group_id = H5Gopen(fid, GRP_NAME); CHECK(group_id, FAIL, "H5Gcreate"); /* Test H5Iget_file_id() */ |