[svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:

svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi compilers)

Also merged effected non-Fortran files: 
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in

1 files changed, 129 insertions, 129 deletions

diff --git a/fortran/src/phdf5_fortrandll.def b/fortran/src/phdf5_fortrandll.def
index 411de51..a4bc9eb 100644
--- a/fortran/src/phdf5_fortrandll.def
+++ b/fortran/src/phdf5_fortrandll.def
@@ -50,54 +50,54 @@ H5_DBLE_INTERFACE_mp_H5PREGISTER_DOUBLE
 H5A_mp_H5ACREATE_F

 H5A_mp_H5AOPEN_NAME_F

 H5A_mp_H5AOPEN_IDX_F

-H5A_mp_H5AWRITE_INTEGER_SCALAR

-H5A_mp_H5AWRITE_INTEGER_1

-H5A_mp_H5AWRITE_INTEGER_2

-H5A_mp_H5AWRITE_INTEGER_3

-H5A_mp_H5AWRITE_INTEGER_4

-H5A_mp_H5AWRITE_INTEGER_5

-H5A_mp_H5AWRITE_INTEGER_6

-H5A_mp_H5AWRITE_INTEGER_7

-H5A_mp_H5AWRITE_REAL_SCALAR

-H5A_mp_H5AWRITE_REAL_1

-H5A_mp_H5AWRITE_REAL_2

-H5A_mp_H5AWRITE_REAL_3

-H5A_mp_H5AWRITE_REAL_4

-H5A_mp_H5AWRITE_REAL_5

-H5A_mp_H5AWRITE_REAL_6

-H5A_mp_H5AWRITE_REAL_7

-H5A_mp_H5AWRITE_CHAR_SCALAR

-H5A_mp_H5AWRITE_CHAR_1

-H5A_mp_H5AWRITE_CHAR_2

-H5A_mp_H5AWRITE_CHAR_3

-H5A_mp_H5AWRITE_CHAR_4

-H5A_mp_H5AWRITE_CHAR_5

-H5A_mp_H5AWRITE_CHAR_6

-H5A_mp_H5AWRITE_CHAR_7

-H5A_mp_H5AREAD_INTEGER_SCALAR

-H5A_mp_H5AREAD_INTEGER_1

-H5A_mp_H5AREAD_INTEGER_2

-H5A_mp_H5AREAD_INTEGER_3

-H5A_mp_H5AREAD_INTEGER_4

-H5A_mp_H5AREAD_INTEGER_5

-H5A_mp_H5AREAD_INTEGER_6

-H5A_mp_H5AREAD_INTEGER_7

-H5A_mp_H5AREAD_REAL_SCALAR

-H5A_mp_H5AREAD_REAL_1

-H5A_mp_H5AREAD_REAL_2

-H5A_mp_H5AREAD_REAL_3

-H5A_mp_H5AREAD_REAL_4

-H5A_mp_H5AREAD_REAL_5

-H5A_mp_H5AREAD_REAL_6

-H5A_mp_H5AREAD_REAL_7

-H5A_mp_H5AREAD_CHAR_SCALAR

-H5A_mp_H5AREAD_CHAR_1

-H5A_mp_H5AREAD_CHAR_2

-H5A_mp_H5AREAD_CHAR_3

-H5A_mp_H5AREAD_CHAR_4

-H5A_mp_H5AREAD_CHAR_5

-H5A_mp_H5AREAD_CHAR_6

-H5A_mp_H5AREAD_CHAR_7

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_SCALAR

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_1

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_2

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_3

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_4

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_5

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_6

+H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_7

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_SCALAR

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_1

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_2

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_3

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_4

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_5

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_6

+H5A_PROVISIONAL_mp_H5AWRITE_REAL_7

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_SCALAR

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_1

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_2

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_3

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_4

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_5

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_6

+H5A_PROVISIONAL_mp_H5AWRITE_CHAR_7

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_SCALAR

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_1

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_2

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_3

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_4

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_5

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_6

+H5A_PROVISIONAL_mp_H5AREAD_INTEGER_7

+H5A_PROVISIONAL_mp_H5AREAD_REAL_SCALAR

+H5A_PROVISIONAL_mp_H5AREAD_REAL_1

+H5A_PROVISIONAL_mp_H5AREAD_REAL_2

+H5A_PROVISIONAL_mp_H5AREAD_REAL_3

+H5A_PROVISIONAL_mp_H5AREAD_REAL_4

+H5A_PROVISIONAL_mp_H5AREAD_REAL_5

+H5A_PROVISIONAL_mp_H5AREAD_REAL_6

+H5A_PROVISIONAL_mp_H5AREAD_REAL_7

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_SCALAR

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_1

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_2

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_3

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_4

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_5

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_6

+H5A_PROVISIONAL_mp_H5AREAD_CHAR_7

 H5A_mp_H5AGET_SPACE_F

 H5A_mp_H5AGET_TYPE_F

 H5A_mp_H5AGET_NAME_F

@@ -124,58 +124,58 @@ H5A_mp_H5ARENAME_F
 H5D_mp_H5DCREATE_F

 H5D_mp_H5DOPEN_F

 H5D_mp_H5DCLOSE_F

-H5D_mp_H5DWRITE_REFERENCE_OBJ

-H5D_mp_H5DWRITE_REFERENCE_DSETREG

-H5D_mp_H5DWRITE_INTEGER_SCALAR

-H5D_mp_H5DWRITE_INTEGER_1

-H5D_mp_H5DWRITE_INTEGER_2

-H5D_mp_H5DWRITE_INTEGER_3

-H5D_mp_H5DWRITE_INTEGER_4

-H5D_mp_H5DWRITE_INTEGER_5

-H5D_mp_H5DWRITE_INTEGER_6

-H5D_mp_H5DWRITE_INTEGER_7

-H5D_mp_H5DWRITE_CHAR_SCALAR

-H5D_mp_H5DWRITE_CHAR_1

-H5D_mp_H5DWRITE_CHAR_2

-H5D_mp_H5DWRITE_CHAR_3

-H5D_mp_H5DWRITE_CHAR_4

-H5D_mp_H5DWRITE_CHAR_5

-H5D_mp_H5DWRITE_CHAR_6

-H5D_mp_H5DWRITE_CHAR_7

-H5D_mp_H5DWRITE_REAL_SCALAR

-H5D_mp_H5DWRITE_REAL_1

-H5D_mp_H5DWRITE_REAL_2

-H5D_mp_H5DWRITE_REAL_3

-H5D_mp_H5DWRITE_REAL_4

-H5D_mp_H5DWRITE_REAL_5

-H5D_mp_H5DWRITE_REAL_6

-H5D_mp_H5DWRITE_REAL_7

-H5D_mp_H5DREAD_REFERENCE_OBJ

-H5D_mp_H5DREAD_REFERENCE_DSETREG

-H5D_mp_H5DREAD_INTEGER_SCALAR

-H5D_mp_H5DREAD_INTEGER_1

-H5D_mp_H5DREAD_INTEGER_2

-H5D_mp_H5DREAD_INTEGER_3

-H5D_mp_H5DREAD_INTEGER_4

-H5D_mp_H5DREAD_INTEGER_5

-H5D_mp_H5DREAD_INTEGER_6

-H5D_mp_H5DREAD_INTEGER_7

-H5D_mp_H5DREAD_CHAR_SCALAR

-H5D_mp_H5DREAD_CHAR_1

-H5D_mp_H5DREAD_CHAR_2

-H5D_mp_H5DREAD_CHAR_3

-H5D_mp_H5DREAD_CHAR_4

-H5D_mp_H5DREAD_CHAR_5

-H5D_mp_H5DREAD_CHAR_6

-H5D_mp_H5DREAD_CHAR_7

-H5D_mp_H5DREAD_REAL_SCALAR

-H5D_mp_H5DREAD_REAL_1

-H5D_mp_H5DREAD_REAL_2

-H5D_mp_H5DREAD_REAL_3

-H5D_mp_H5DREAD_REAL_4

-H5D_mp_H5DREAD_REAL_5

-H5D_mp_H5DREAD_REAL_6

-H5D_mp_H5DREAD_REAL_7

+H5D_PROVISIONAL_mp_H5DWRITE_REFERENCE_OBJ

+H5D_PROVISIONAL_mp_H5DWRITE_REFERENCE_DSETREG

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_SCALAR

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_1

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_2

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_3

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_4

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_5

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_6

+H5D_PROVISIONAL_mp_H5DWRITE_INTEGER_7

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_SCALAR

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_1

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_2

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_3

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_4

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_5

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_6

+H5D_PROVISIONAL_mp_H5DWRITE_CHAR_7

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_SCALAR

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_1

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_2

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_3

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_4

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_5

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_6

+H5D_PROVISIONAL_mp_H5DWRITE_REAL_7

+H5D_PROVISIONAL_mp_H5DREAD_REFERENCE_OBJ

+H5D_PROVISIONAL_mp_H5DREAD_REFERENCE_DSETREG

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_SCALAR

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_1

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_2

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_3

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_4

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_5

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_6

+H5D_PROVISIONAL_mp_H5DREAD_INTEGER_7

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_SCALAR

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_1

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_2

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_3

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_4

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_5

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_6

+H5D_PROVISIONAL_mp_H5DREAD_CHAR_7

+H5D_PROVISIONAL_mp_H5DREAD_REAL_SCALAR

+H5D_PROVISIONAL_mp_H5DREAD_REAL_1

+H5D_PROVISIONAL_mp_H5DREAD_REAL_2

+H5D_PROVISIONAL_mp_H5DREAD_REAL_3

+H5D_PROVISIONAL_mp_H5DREAD_REAL_4

+H5D_PROVISIONAL_mp_H5DREAD_REAL_5

+H5D_PROVISIONAL_mp_H5DREAD_REAL_6

+H5D_PROVISIONAL_mp_H5DREAD_REAL_7

 H5D_mp_H5DGET_SPACE_F

 H5D_mp_H5DGET_TYPE_F

 H5D_mp_H5DSET_EXTENT_F

@@ -188,9 +188,9 @@ H5D_mp_H5DWRITE_VL_REAL
 H5D_mp_H5DREAD_VL_REAL

 H5D_mp_H5DWRITE_VL_STRING

 H5D_mp_H5DREAD_VL_STRING

-H5D_mp_H5DFILL_INTEGER

-H5D_mp_H5DFILL_REAL

-H5D_mp_H5DFILL_CHAR

+H5D_PROVISIONAL_mp_H5DFILL_INTEGER

+H5D_PROVISIONAL_mp_H5DFILL_REAL

+H5D_PROVISIONAL_mp_H5DFILL_CHAR

 H5D_mp_H5DGET_SPACE_STATUS_F

 H5D_mp_H5DCREATE_ANON_F

 H5D_mp_H5DGET_SPACE_F

@@ -205,7 +205,7 @@ H5E_mp_H5ECLEAR_F
 H5E_mp_H5EPRINT_F

 H5E_mp_H5EGET_MAJOR_F

 H5E_mp_H5EGET_MINOR_F

-H5E_mp_H5ESET_AUTO_F

+H5E_PROVISIONAL_mp_H5ESET_AUTO_F

 ; H5F

 H5F_mp_H5FCREATE_F

 H5F_mp_H5FFLUSH_F

@@ -297,12 +297,12 @@ H5P_mp_H5PCLOSE_F
 H5P_mp_H5PSET_CHUNK_F

 H5P_mp_H5PGET_CHUNK_F

 H5P_mp_H5PSET_DEFLATE_F

-H5P_mp_H5PSET_FILL_VALUE_INTEGER

-H5P_mp_H5PGET_FILL_VALUE_INTEGER

-H5P_mp_H5PSET_FILL_VALUE_REAL

-H5P_mp_H5PGET_FILL_VALUE_REAL

-H5P_mp_H5PSET_FILL_VALUE_CHAR

-H5P_mp_H5PGET_FILL_VALUE_CHAR

+H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_INTEGER

+H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_INTEGER

+H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_REAL

+H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_REAL

+H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_CHAR

+H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_CHAR

 H5P_mp_H5PGET_VERSION_F

 H5P_mp_H5PSET_USERBLOCK_F

 H5P_mp_H5PGET_USERBLOCK_F

@@ -354,12 +354,12 @@ H5P_mp_H5PSET_SMALL_DATA_BLOCK_SIZE_F
 H5P_mp_H5PGET_SMALL_DATA_BLOCK_SIZE_F

 H5P_mp_H5PSET_HYPER_VECTOR_SIZE_F

 H5P_mp_H5PGET_HYPER_VECTOR_SIZE_F

-H5P_mp_H5PSET_INTEGER

-H5P_mp_H5PSET_REAL

-H5P_mp_H5PSET_CHAR

-H5P_mp_H5PGET_INTEGER

-H5P_mp_H5PGET_REAL

-H5P_mp_H5PGET_CHAR

+H5P_PROVISIONAL_mp_H5PSET_INTEGER

+H5P_PROVISIONAL_mp_H5PSET_REAL

+H5P_PROVISIONAL_mp_H5PSET_CHAR

+H5P_PROVISIONAL_mp_H5PGET_INTEGER

+H5P_PROVISIONAL_mp_H5PGET_REAL

+H5P_PROVISIONAL_mp_H5PGET_CHAR

 H5P_mp_H5PEXIST_F

 H5P_mp_H5PGET_SIZE_F

 H5P_mp_H5PGET_NPROPS_F

@@ -370,13 +370,13 @@ H5P_mp_H5PCOPY_PROP_F
 H5P_mp_H5PREMOVE_F

 H5P_mp_H5PUNREGISTER_F

 H5P_mp_H5PCLOSE_CLASS_F

-H5P_mp_H5PCREATE_CLASS_F

-H5P_mp_H5PREGISTER_INTEGER

-H5P_mp_H5PREGISTER_REAL

-H5P_mp_H5PREGISTER_CHAR

-H5P_mp_H5PINSERT_INTEGER

-H5P_mp_H5PINSERT_REAL

-H5P_mp_H5PINSERT_CHAR

+H5P_PROVISIONAL_mp_H5PCREATE_CLASS_F

+H5P_PROVISIONAL_mp_H5PREGISTER_INTEGER

+H5P_PROVISIONAL_mp_H5PREGISTER_REAL

+H5P_PROVISIONAL_mp_H5PREGISTER_CHAR

+H5P_PROVISIONAL_mp_H5PINSERT_INTEGER

+H5P_PROVISIONAL_mp_H5PINSERT_REAL

+H5P_PROVISIONAL_mp_H5PINSERT_CHAR

 H5P_mp_H5PSET_SHUFFLE_F

 H5P_mp_H5PSET_EDC_CHECK_F

 H5P_mp_H5PGET_EDC_CHECK_F

@@ -424,14 +424,14 @@ H5P_mp_H5PGET_CREATE_INTER_GROUP_F
 H5P_mp_H5PSET_CHUNK_CACHE_F

 H5P_mp_H5PGET_CHUNK_CACHE_F

 ; H5R

-H5R_mp_H5RCREATE_OBJECT_F

-H5R_mp_H5RCREATE_REGION_F

-H5R_mp_H5RDEREFERENCE_OBJECT_F

-H5R_mp_H5RDEREFERENCE_REGION_F

+H5R_PROVISIONAL_mp_H5RCREATE_OBJECT_F

+H5R_PROVISIONAL_mp_H5RCREATE_REGION_F

+H5R_PROVISIONAL_mp_H5RDEREFERENCE_OBJECT_F

+H5R_PROVISIONAL_mp_H5RDEREFERENCE_REGION_F

 H5R_mp_H5RGET_REGION_REGION_F

 H5R_mp_H5RGET_OBJECT_TYPE_OBJ_F

-H5R_mp_H5RGET_NAME_OBJECT_F

-H5R_mp_H5RGET_NAME_REGION_F

+H5R_PROVISIONAL_mp_H5RGET_NAME_OBJECT_F

+H5R_PROVISIONAL_mp_H5RGET_NAME_REGION_F

 ; H5S

 H5S_mp_H5SCREATE_SIMPLE_F

 H5S_mp_H5SCLOSE_F