[svn-r17519] Description:

Merged changes in the trunk/fortran to 1.8.

svn merge -r 17485:17517 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Brings bugfixes into 1.8 for:

Bug [1471] -  H5Tset_order_f missing constant option H5T_ORDER_NONE


Tested: smirom (ifort)
        smirom (pgi)

3 files changed, 55 insertions, 46 deletions

diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90
index 0023e14..2f359e9 100644
--- a/fortran/src/H5Lff.f90
+++ b/fortran/src/H5Lff.f90
@@ -581,7 +581,8 @@ CONTAINS
 !     	                H5L_LINK_EXTERNAL_F  - External link
 !     	                H5L_LINK_ERROR_ F    - Error
 !           address - If the link is a hard link, address specifies the file address that the link points to
-!          val_size - If the link is a symbolic link, val_size will be the length of the link value
+!          val_size - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
+!                     the length of the name of the pointed-to object with a null terminator. 
 !            hdferr - error code		
 !				 Success:  0
 !				 Failure: -1   
@@ -613,7 +614,8 @@ CONTAINS
      	                              !  H5L_LINK_EXTERNAL_F  - External link
      	                              !  H5L_LINK_ERROR _F    - Error
     INTEGER(HADDR_T), INTENT(OUT) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-    INTEGER(SIZE_T), INTENT(OUT) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
+    INTEGER(SIZE_T), INTENT(OUT) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value, e.g., 
+                                             ! the length of the name of the pointed-to object with a null terminator. 
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
@@ -676,8 +678,10 @@ CONTAINS
 ! Outputs:  NOTE: In C these are defined as a structure: H5L_info_t
 !    corder_valid   - indicates whether the creation order data is valid for this attribute
 !    corder         - is a positive integer containing the creation order of the attribute        
-!    cset           - indicates the character set used for the attribute’s name          
-!    data_size      - indicates the size, in the number of characters, of the attribute	
+!    cset           - indicates the character set used for the attribute’s name 
+!    address        - If the link is a hard link, address specifies the file address that the link points to
+!    val_size       - If the link is a symbolic link, val_size will be the length of the link value, e.g., 
+!                     the length of the name of the pointed-to object with a null terminator. 
 !    hdferr         - error code		
 !				 Success:  0
 !				 Failure: -1   
@@ -715,7 +719,8 @@ CONTAINS
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
     INTEGER(HADDR_T), INTENT(OUT) :: address  ! If the link is a hard link, address specifies the file address that the link points to
-    INTEGER(SIZE_T), INTENT(OUT) :: val_size   ! Indicates the size, in the number of characters, of the attribute for symbolic link
+    INTEGER(SIZE_T), INTENT(OUT) :: val_size  ! If the link is a symbolic link, val_size will be the length of the link value, e.g., 
+                                              ! the length of the name of the pointed-to object with a null terminator. 
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index a8b2d95..e0748b5b 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -557,26 +557,28 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
       h5t_flags[10] = (int_f)H5T_ORDER_LE;
       h5t_flags[11] = (int_f)H5T_ORDER_BE;
       h5t_flags[12] = (int_f)H5T_ORDER_VAX;
-      h5t_flags[13] = (int_f)H5T_PAD_ZERO;
-      h5t_flags[14] = (int_f)H5T_PAD_ONE;
-      h5t_flags[15] = (int_f)H5T_PAD_BACKGROUND;
-      h5t_flags[16] = (int_f)H5T_PAD_ERROR;
-      h5t_flags[17] = (int_f)H5T_SGN_NONE;
-      h5t_flags[18] = (int_f)H5T_SGN_2;
-      h5t_flags[19] = (int_f)H5T_SGN_ERROR;
-      h5t_flags[20] = (int_f)H5T_NORM_IMPLIED;
-      h5t_flags[21] = (int_f)H5T_NORM_MSBSET;
-      h5t_flags[22] = (int_f)H5T_NORM_NONE;
-      h5t_flags[23] = (int_f)H5T_CSET_ASCII;
-      h5t_flags[24] = (int_f)H5T_CSET_UTF8;
-      h5t_flags[25] = (int_f)H5T_STR_NULLTERM;
-      h5t_flags[26] = (int_f)H5T_STR_NULLPAD;
-      h5t_flags[27] = (int_f)H5T_STR_SPACEPAD;
-      h5t_flags[28] = (int_f)H5T_STR_ERROR;
-      h5t_flags[29] = (int_f)H5T_VLEN;
-      h5t_flags[30] = (int_f)H5T_ARRAY;
-      h5t_flags[31] = (int_f)H5T_DIR_ASCEND;
-      h5t_flags[32] = (int_f)H5T_DIR_DESCEND;
+      h5t_flags[13] = (int_f)H5T_ORDER_NONE;
+      h5t_flags[14] = (int_f)H5T_PAD_ZERO;
+      h5t_flags[15] = (int_f)H5T_PAD_ONE;
+      h5t_flags[16] = (int_f)H5T_PAD_BACKGROUND;
+      h5t_flags[17] = (int_f)H5T_PAD_ERROR;
+      h5t_flags[18] = (int_f)H5T_SGN_NONE;
+      h5t_flags[19] = (int_f)H5T_SGN_2;
+      h5t_flags[20] = (int_f)H5T_SGN_ERROR;
+      h5t_flags[21] = (int_f)H5T_NORM_IMPLIED;
+      h5t_flags[22] = (int_f)H5T_NORM_MSBSET;
+      h5t_flags[23] = (int_f)H5T_NORM_NONE;
+      h5t_flags[24] = (int_f)H5T_CSET_ASCII;
+      h5t_flags[25] = (int_f)H5T_CSET_UTF8;
+      h5t_flags[26] = (int_f)H5T_STR_NULLTERM;
+      h5t_flags[27] = (int_f)H5T_STR_NULLPAD;
+      h5t_flags[28] = (int_f)H5T_STR_SPACEPAD;
+      h5t_flags[29] = (int_f)H5T_STR_ERROR;
+      h5t_flags[30] = (int_f)H5T_VLEN;
+      h5t_flags[31] = (int_f)H5T_ARRAY;
+      h5t_flags[32] = (int_f)H5T_DIR_ASCEND;
+      h5t_flags[33] = (int_f)H5T_DIR_DESCEND;
+
 /*
  *  H5Z flags
  */
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 3fc247f..28d00f7 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -687,7 +687,7 @@ MODULE H5GLOBAL
   !
   ! H5T flags declaration
   !
-  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 33
+  INTEGER, PARAMETER :: H5T_FLAGS_LEN = 34
   INTEGER H5T_flags(H5T_FLAGS_LEN)
   !DEC$if defined(BUILD_HDF5_DLL)
   !DEC$ATTRIBUTES DLLEXPORT :: /H5T_FLAGS/
@@ -709,6 +709,7 @@ MODULE H5GLOBAL
   INTEGER ::  H5T_ORDER_LE_F 
   INTEGER ::  H5T_ORDER_BE_F
   INTEGER ::  H5T_ORDER_VAX_F
+  INTEGER ::  H5T_ORDER_NONE_F
   INTEGER ::  H5T_PAD_ZERO_F
   INTEGER ::  H5T_PAD_ONE_F
   INTEGER ::  H5T_PAD_BACKGROUND_F
@@ -741,26 +742,27 @@ MODULE H5GLOBAL
   EQUIVALENCE(H5T_flags(11), H5T_ORDER_LE_F)
   EQUIVALENCE(H5T_flags(12), H5T_ORDER_BE_F)
   EQUIVALENCE(H5T_flags(13), H5T_ORDER_VAX_F)
-  EQUIVALENCE(H5T_flags(14), H5T_PAD_ZERO_F)
-  EQUIVALENCE(H5T_flags(15), H5T_PAD_ONE_F)
-  EQUIVALENCE(H5T_flags(16), H5T_PAD_BACKGROUND_F)
-  EQUIVALENCE(H5T_flags(17), H5T_PAD_ERROR_F)
-  EQUIVALENCE(H5T_flags(18), H5T_SGN_NONE_F)
-  EQUIVALENCE(H5T_flags(19), H5T_SGN_2_F)
-  EQUIVALENCE(H5T_flags(20), H5T_SGN_ERROR_F)
-  EQUIVALENCE(H5T_flags(21), H5T_NORM_IMPLIED_F)
-  EQUIVALENCE(H5T_flags(22), H5T_NORM_MSBSET_F)
-  EQUIVALENCE(H5T_flags(23), H5T_NORM_NONE_F)
-  EQUIVALENCE(H5T_flags(24), H5T_CSET_ASCII_F)
-  EQUIVALENCE(H5T_flags(25), H5T_CSET_UTF8_F)
-  EQUIVALENCE(H5T_flags(26), H5T_STR_NULLTERM_F)
-  EQUIVALENCE(H5T_flags(27), H5T_STR_NULLPAD_F)
-  EQUIVALENCE(H5T_flags(28), H5T_STR_SPACEPAD_F)
-  EQUIVALENCE(H5T_flags(29), H5T_STR_ERROR_F)
-  EQUIVALENCE(H5T_flags(30), H5T_VLEN_F)
-  EQUIVALENCE(H5T_flags(31), H5T_ARRAY_F)
-  EQUIVALENCE(H5T_flags(32), H5T_DIR_ASCEND_F)
-  EQUIVALENCE(H5T_flags(33), H5T_DIR_DESCEND_F)
+  EQUIVALENCE(H5T_flags(14), H5T_ORDER_NONE_F)
+  EQUIVALENCE(H5T_flags(15), H5T_PAD_ZERO_F)
+  EQUIVALENCE(H5T_flags(16), H5T_PAD_ONE_F)
+  EQUIVALENCE(H5T_flags(17), H5T_PAD_BACKGROUND_F)
+  EQUIVALENCE(H5T_flags(18), H5T_PAD_ERROR_F)
+  EQUIVALENCE(H5T_flags(19), H5T_SGN_NONE_F)
+  EQUIVALENCE(H5T_flags(20), H5T_SGN_2_F)
+  EQUIVALENCE(H5T_flags(21), H5T_SGN_ERROR_F)
+  EQUIVALENCE(H5T_flags(22), H5T_NORM_IMPLIED_F)
+  EQUIVALENCE(H5T_flags(23), H5T_NORM_MSBSET_F)
+  EQUIVALENCE(H5T_flags(24), H5T_NORM_NONE_F)
+  EQUIVALENCE(H5T_flags(25), H5T_CSET_ASCII_F)
+  EQUIVALENCE(H5T_flags(26), H5T_CSET_UTF8_F)
+  EQUIVALENCE(H5T_flags(27), H5T_STR_NULLTERM_F)
+  EQUIVALENCE(H5T_flags(28), H5T_STR_NULLPAD_F)
+  EQUIVALENCE(H5T_flags(29), H5T_STR_SPACEPAD_F)
+  EQUIVALENCE(H5T_flags(30), H5T_STR_ERROR_F)
+  EQUIVALENCE(H5T_flags(31), H5T_VLEN_F)
+  EQUIVALENCE(H5T_flags(32), H5T_ARRAY_F)
+  EQUIVALENCE(H5T_flags(33), H5T_DIR_ASCEND_F)
+  EQUIVALENCE(H5T_flags(34), H5T_DIR_DESCEND_F)
 
   !
   ! H5Z flags declaration