diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 22:25:51 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-20 22:25:51 (GMT) |
| commit | a42f3b9ddaca2f2d566f38bebdd419a3c941669a (patch) | |
| tree | 25a72d07ec797cefb5364ea6baf17818f5ffe1a5 /src/H5Oshared.c | |
| parent | 7beed66358ff6c3d664526bc6e7b9d5990238331 (diff) | |
| download | hdf5-a42f3b9ddaca2f2d566f38bebdd419a3c941669a.zip hdf5-a42f3b9ddaca2f2d566f38bebdd419a3c941669a.tar.gz hdf5-a42f3b9ddaca2f2d566f38bebdd419a3c941669a.tar.bz2 | |
[svn-r21134] Description:
Bring r21133 from trunk to 1.8 branch:
More code cleanups to reduce coupling between packages that use the H5F
internal routines, but really aren't part of the H5F "package".
Tested on:
FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Diffstat (limited to 'src/H5Oshared.c')
| -rw-r--r-- | src/H5Oshared.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 6e2beca..ac33702 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -30,7 +30,6 @@ /* Module Setup */ /****************/ -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5O_PACKAGE /*suppress error about including H5Opkg */ @@ -39,7 +38,7 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fpkg.h" /* File access */ +#include "H5Fprivate.h" /* File access */ #include "H5Gprivate.h" /* Groups */ #include "H5HFprivate.h" /* Fractal heap */ #include "H5Opkg.h" /* Object headers */ @@ -418,8 +417,8 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me version = H5O_SHARED_VERSION_2; /* version 1 is no longer used */ } /* end else */ - *buf++ = version; - *buf++ = (unsigned)sh_mesg->type; + *buf++ = (uint8_t)version; + *buf++ = (uint8_t)sh_mesg->type; /* Encode either the heap ID of the message or the address of the * object header that holds it. @@ -483,8 +482,8 @@ H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg) FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shared_size) if(sh_mesg->type == H5O_SHARE_TYPE_COMMITTED) { - ret_value = 1 + /*version */ - 1 + /*the type field */ + ret_value = (size_t)1 + /*version */ + (size_t)1 + /*the type field */ H5F_SIZEOF_ADDR(f); /*sharing by another obj hdr */ } /* end if */ else { |