[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:

1 files changed, 6 insertions, 17 deletions

diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index c4daeb1..951d49b 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -94,7 +94,7 @@ typedef enum H5T_cset_t {
     H5T_CSET_RESERVED_14 = 14,  /*reserved for later use		     */
     H5T_CSET_RESERVED_15 = 15   /*reserved for later use		     */
 } H5T_cset_t;
-#define H5T_NCSET 1    		/*Number of character sets actually defined  */
+#define H5T_NCSET H5T_CSET_RESERVED_1    		/*Number of character sets actually defined  */
 
 /*
  * Type of padding to use in character strings.  Do not change these values
@@ -119,7 +119,7 @@ typedef enum H5T_str_t {
     H5T_STR_RESERVED_14  = 14,  /*reserved for later use		     */
     H5T_STR_RESERVED_15  = 15   /*reserved for later use		     */
 } H5T_str_t;
-#define H5T_NSTR 3		/*num H5T_str_t types actually defined	     */
+#define H5T_NSTR H5T_STR_RESERVED_3		/*num H5T_str_t types actually defined	     */
 
 /* Type of padding to use in other atomic types */
 typedef enum H5T_pad_t {
@@ -207,13 +207,13 @@ typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 typedef H5T_conv_ret_t (*H5T_conv_except_func_t)(int except_type, hid_t src_id, 
             hid_t dst_id, void *src_buf, void *dst_buf, void *user_data);
 
-/* When this header is included from H5Tprivate.h, don't make calls to H5open() */
+/* When this header is included from a private header, don't make calls to H5open() */
 #undef H5OPEN
-#ifndef _H5Tprivate_H
+#ifndef _H5private_H
 #define H5OPEN          H5open(),
-#else   /* _H5Tprivate_H */
+#else   /* _H5private_H */
 #define H5OPEN
-#endif  /* _H5Tprivate_H */
+#endif  /* _H5private_H */
 
 /*
  * The IEEE floating point types in various byte orders.
@@ -533,23 +533,12 @@ H5_DLL H5T_norm_t H5Tget_norm(hid_t type_id);
 H5_DLL H5T_pad_t H5Tget_inpad(hid_t type_id);
 H5_DLL H5T_str_t H5Tget_strpad(hid_t type_id);
 H5_DLL int H5Tget_nmembers(hid_t type_id);
-#ifdef H5_WANT_H5_V1_6_COMPAT
-H5_DLL char *H5Tget_member_name(hid_t type_id, int membno);
-#else /* H5_WANT_H5_V1_6_COMPAT */
 H5_DLL char *H5Tget_member_name(hid_t type_id, unsigned membno);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
 H5_DLL int H5Tget_member_index(hid_t type_id, const char *name);
-#ifdef H5_WANT_H5_V1_6_COMPAT
-H5_DLL size_t H5Tget_member_offset(hid_t type_id, int membno);
-H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, int membno);
-H5_DLL hid_t H5Tget_member_type(hid_t type_id, int membno);
-H5_DLL herr_t H5Tget_member_value(hid_t type_id, int membno, void *value/*out*/);
-#else /* H5_WANT_H5_V1_6_COMPAT */
 H5_DLL size_t H5Tget_member_offset(hid_t type_id, unsigned membno);
 H5_DLL H5T_class_t H5Tget_member_class(hid_t type_id, unsigned membno);
 H5_DLL hid_t H5Tget_member_type(hid_t type_id, unsigned membno);
 H5_DLL herr_t H5Tget_member_value(hid_t type_id, unsigned membno, void *value/*out*/);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
 H5_DLL H5T_cset_t H5Tget_cset(hid_t type_id);
 H5_DLL htri_t H5Tis_variable_str(hid_t type_id);
 H5_DLL hid_t H5Tget_native_type(hid_t type_id, H5T_direction_t direction);