[svn-r14104] Description:

	Pursue calls to H5Gcreate() relentlessly and ruthlessly exterminate
them, leaving only a few tame specimens in text files and comments.  ;-)

Tested on:
	Mac OS X/32 10.4.10 (amazon)
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Linux/64 2.6 (smirom)
	Solaris/32 5.10 (linew)

5 files changed, 40 insertions, 6 deletions

diff --git a/src/H5G.c b/src/H5G.c
index f68ce1e..160fda0 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -255,7 +255,7 @@ done:
  *              H5Llink or it will be deleted when closed.
  *
  *              Given the default setting, H5Gcreate_anon() followed by
- *              H5Llink() will have the same function as H5Gcreate().
+ *              H5Llink() will have the same function as H5Gcreate2().
  *
  * Usage:       H5Gcreate_anon(loc_id, char *name, gcpl_id, gapl_id)
  *                  hid_t loc_id;	  IN: File or group identifier
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index b94a365..613c922 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -126,9 +126,10 @@ H5G_init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5G_init())
 } /* H5G_init_deprec_interface() */
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 
 /*-------------------------------------------------------------------------
- * Function:	H5Gcreate
+ * Function:	H5Gcreate1
  *
  * Purpose:	Creates a new group relative to LOC_ID and gives it the
  *		specified NAME.  The group is opened for write access
@@ -151,14 +152,14 @@ H5G_init_deprec_interface(void)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Gcreate(hid_t loc_id, const char *name, size_t size_hint)
+H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
 {
     H5G_loc_t	    loc;                /* Location to create group */
     H5G_t	   *grp = NULL;         /* New group created */
     hid_t           tmp_gcpl = (-1);    /* Temporary group creation property list */
     hid_t	    ret_value;          /* Return value */
 
-    FUNC_ENTER_API(H5Gcreate, FAIL)
+    FUNC_ENTER_API(H5Gcreate1, FAIL)
     H5TRACE3("i", "i*sz", loc_id, name, size_hint);
 
     /* Check arguments */
@@ -213,7 +214,8 @@ done:
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_API(ret_value)
-} /* end H5Gcreate() */
+} /* end H5Gcreate1() */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 59c9307..912a637 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -137,7 +137,6 @@ H5_DLL herr_t H5Gclose(hid_t group_id);
  * 
  * Use of these functions and variables is deprecated.
  */
-H5_DLL hid_t H5Gcreate(hid_t loc_id, const char *name, size_t size_hint);
 H5_DLL hid_t H5Gopen(hid_t loc_id, const char *name);
 H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name,
     const char *new_name);
@@ -161,6 +160,18 @@ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
 H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name,
     hbool_t follow_link, H5G_stat_t *statbuf/*out*/);
 H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs);
+/* Symbols defined for compatibility with previous versions of the HDF5 API.
+ * 
+ * Use of these symbols is deprecated.
+ */
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+
+/* Typedefs */
+
+/* Function prototypes */
+H5_DLL hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint);
+
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 #ifdef __cplusplus
 }
diff --git a/src/H5vers.txt b/src/H5vers.txt
index e01ea81..4a3ee46 100644
--- a/src/H5vers.txt
+++ b/src/H5vers.txt
@@ -51,6 +51,7 @@ FUNCTION: H5Eprint; ; v10, v18
 FUNCTION: H5Epush; ; v14, v18
 FUNCTION: H5Eset_auto; ; v10, v18
 FUNCTION: H5Ewalk; H5E_walk, H5E_error; v10, v18
+FUNCTION: H5Gcreate; ; v10, v18
 
 # API typedefs
 # (although not required, it's easier to compare this file with the headers
diff --git a/src/H5version.h b/src/H5version.h
index 43e82dc..ac6020e 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -37,28 +37,39 @@
 /*************/
 /* Functions */
 /*************/
+
 #if !defined(H5Eclear_vers)
 #define H5Eclear_vers 1
 #endif /* !defined(H5Eclear_vers) */
+
 #if !defined(H5Eget_auto_vers)
 #define H5Eget_auto_vers 1
 #endif /* !defined(H5Eget_auto_vers) */
+
 #if !defined(H5Eprint_vers)
 #define H5Eprint_vers 1
 #endif /* !defined(H5Eprint_vers) */
+
 #if !defined(H5Epush_vers)
 #define H5Epush_vers 1
 #endif /* !defined(H5Epush_vers) */
+
 #if !defined(H5Eset_auto_vers)
 #define H5Eset_auto_vers 1
 #endif /* !defined(H5Eset_auto_vers) */
+
 #if !defined(H5Ewalk_vers)
 #define H5Ewalk_vers 1
 #endif /* !defined(H5Ewalk_vers) */
 
+#if !defined(H5Gcreate_vers)
+#define H5Gcreate_vers 1
+#endif /* !defined(H5Gcreate_vers) */
+
 /************/
 /* Typedefs */
 /************/
+
 #if !defined(H5E_auto_vers)
 #define H5E_auto_vers 1
 #endif /* !defined(H5E_auto_vers) */
@@ -128,9 +139,18 @@
 #error "H5Ewalk_vers set to invalid value"
 #endif /* H5Ewalk_vers */
 
+#if !defined(H5Gcreate_vers) || H5Gcreate_vers == 2
+#define H5Gcreate H5Gcreate2
+#elif H5Gcreate_vers == 1
+#define H5Gcreate H5Gcreate1
+#else /* H5Gcreate_vers */
+#error "H5Gcreate_vers set to invalid value"
+#endif /* H5Gcreate_vers */
+
 /************/
 /* Typedefs */
 /************/
+
 #if !defined(H5E_auto_vers) || H5E_auto_vers == 2
 #define H5E_auto_t H5E_auto2_t
 #elif H5E_auto_vers == 1