[svn-r7181] Purpose:

    Version update

Description:
    Removed 1.4 compatibility code in the library.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

1 files changed, 0 insertions, 20 deletions

diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 5a48e30..88b6c45 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -52,17 +52,6 @@ typedef enum H5G_link_t {
  * application is running.  An object may satisfy the `isa' function for more
  * than one type.
  */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-#define    H5G_UNKNOWN          -1		/* Unknown object type		*/
-#define    H5G_LINK             0		/* Object is a symbolic link	*/
-#define    H5G_GROUP            1		/* Object is a group		*/
-#define    H5G_DATASET          2		/* Object is a dataset		*/
-#define    H5G_TYPE             3		/* Object is a named data type	*/
-#define    H5G_RESERVED_4       4		/* Reserved for future use	*/
-#define    H5G_RESERVED_5       5		/* Reserved for future use	*/
-#define    H5G_RESERVED_6       6		/* Reserved for future use	*/
-#define    H5G_RESERVED_7       7		/* Reserved for future use	*/
-#else /*H5_WANT_H5_V1_4_COMPAT*/
 typedef enum H5G_obj_t {
     H5G_UNKNOWN = -1,		/* Unknown object type		*/
     H5G_LINK,		        /* Object is a symbolic link	*/
@@ -74,7 +63,6 @@ typedef enum H5G_obj_t {
     H5G_RESERVED_6,		/* Reserved for future use	*/
     H5G_RESERVED_7		/* Reserved for future use	*/
 } H5G_obj_t;    
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
 
 #define H5G_NTYPES	256		/* Max possible number of types	*/
 #define H5G_NLIBTYPES	8		/* Number of internal types	*/
@@ -86,11 +74,7 @@ typedef struct H5G_stat_t {
     unsigned long 	fileno[2];	/*file number			*/
     unsigned long 	objno[2];	/*object number			*/
     unsigned 		nlink;		/*number of hard links to object*/
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int 		type;		/*basic object type		*/
-#else /*H5_WANT_H5_V1_4_COMPAT*/
     H5G_obj_t 		type;		/*basic object type		*/
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
     time_t		mtime;		/*modification time		*/
     size_t		linklen;	/*symbolic link value length	*/
 } H5G_stat_t;
@@ -111,11 +95,7 @@ H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx,
 			  H5G_iterate_t op, void *op_data);
 H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
 H5_DLL ssize_t H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char* name, size_t size);
-#ifdef H5_WANT_H5_V1_4_COMPAT
-H5_DLL int H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx);
-#else /*H5_WANT_H5_V1_4_COMPAT*/
 H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx);
-#endif /*H5_WANT_H5_V1_4_COMPAT*/
 H5_DLL herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, 
 			const char *dst);
 H5_DLL herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type,