diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:26:20 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-29 14:26:20 (GMT) |
| commit | 427ff7da2848042f68ecfadf5a321b1d8077e9db (patch) | |
| tree | 73024b1954031fbb724c2d96a485590348e5cc22 /tools/misc | |
| parent | 9b96fd2003ae74cca389cc4c2216b4371d6eb173 (diff) | |
| download | hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.zip hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.tar.gz hdf5-427ff7da2848042f68ecfadf5a321b1d8077e9db.tar.bz2 | |
[svn-r9727] Purpose:
Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)
Description:
Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation. So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.
I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".
Platforms tested:
FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
FreeBSD 4.10 (sleipnir) w/threadsafe
FreeBSD 4.10 (sleipnir) w/backward compatibility
Solaris 2.7 (arabica) w/"purify options"
Solaris 2.8 (sol) w/FORTRAN & C++
AIX 5.x (copper) w/parallel & FORTRAN
IRIX64 6.5 (modi4) w/FORTRAN
Linux 2.4 (heping) w/FORTRAN & C++
Misc. update:
Diffstat (limited to 'tools/misc')
| -rwxr-xr-x | tools/misc/h5cc.in | 3 | ||||
| -rw-r--r-- | tools/misc/h5debug.c | 5 | ||||
| -rw-r--r-- | tools/misc/h5repart.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/misc/h5cc.in b/tools/misc/h5cc.in index e2e6364..9257bb3 100755 --- a/tools/misc/h5cc.in +++ b/tools/misc/h5cc.in @@ -247,14 +247,13 @@ if test "x$do_compile" = "xyes"; then fi fi - if test "x$do_link" = "xyes"; then shared_link="" # conditionnaly link with the hl library if test "X$HL" = "Xhl"; then libraries=" $libraries -lhdf5_hl -lhdf5 " else - libraries=" $libraries -lhdf5 " + libraries=" $libraries -lhdf5 " fi link_args="$link_args -L${libdir}" diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 487d1e9..466279c 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -69,7 +69,8 @@ main(int argc, char *argv[]) H5F_t *f; haddr_t addr=0, extra=0; uint8_t sig[16]; - int i, ndims; + int i; + unsigned ndims; herr_t status = SUCCEED; if (argc == 1) { @@ -163,7 +164,7 @@ main(int argc, char *argv[]) break; case H5B_ISTORE_ID: - ndims = (int)extra; + ndims = (unsigned)extra; status = H5D_istore_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, ndims); break; diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c index 2c72852..0518a76 100644 --- a/tools/misc/h5repart.c +++ b/tools/misc/h5repart.c @@ -208,8 +208,7 @@ main (int argc, char *argv[]) int dst_is_family; /*is dst name a family name? */ int dst_membno=0; /*destination member number */ -#ifdef WIN32 - +#if defined(WIN32) && ! defined (__MWERKS__) _int64 left_overs=0; /*amount of zeros left over */ _int64 src_offset=0; /*offset in source member */ _int64 dst_offset=0; /*offset in destination member */ |