[svn-r22274] merge from trunk, resolve conflicts

1 files changed, 30 insertions, 0 deletions

diff --git a/src/H5A.c b/src/H5A.c
index c59e098..0ba7361 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -2566,6 +2566,36 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:    H5A_type
+ *
+ * Purpose:     Return the datatype for an attribute.
+ *
+ * Return:      Success:        Ptr to entry
+ *              Failure:        NULL
+ *
+ * Programmer:  Neil Fortner
+ *              Friday, November  11, 2011
+ *
+ *-------------------------------------------------------------------------
+ */
+H5T_t *
+H5A_type(const H5A_t *attr)
+{
+    H5T_t *ret_value;   /* Return value */
+
+    FUNC_ENTER_NOAPI(NULL)
+
+    HDassert(attr);
+
+    /* Set return value */
+    ret_value = attr->shared->dt;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5A_type() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5Aexists
  *
  * Purpose:	Checks if an attribute with a given name exists on an opened