[svn-r14193] Description:

	Make H5Dopen versioned and change all internal usage to use H5Dopen2

	Add simple regression test for H5Dopen1

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

11 files changed, 20 insertions, 20 deletions

diff --git a/examples/Attributes.txt b/examples/Attributes.txt
index 76f2aae..e32601c 100644
--- a/examples/Attributes.txt
+++ b/examples/Attributes.txt
@@ -85,7 +85,7 @@ H5Aread Example: Attach to an attribute of a dataset and read in attr. data
     file=H5Fopen("example.h5", H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* Open the dataset */
-    dataset=H5Dopen(file,"Dataset1");
+    dataset=H5Dopen2(file, "Dataset1", H5P_DEFAULT);
 
     /* Get the OID of the attribute */
     attr=H5Aopen(dataset, ".", "Attr1", H5P_DEFAULT, H5P_DEFAULT);
@@ -114,10 +114,10 @@ H5Alink Example: Shows how to share an attribute between two datasets.
     file=H5Fopen("example.h5", H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* Open the first dataset */
-    dataset1=H5Dopen(file, "Dataset1");
+    dataset1=H5Dopen2(file, "Dataset1", H5P_DEFAULT);
 
     /* Open the first dataset */
-    dataset2=H5Dopen(file, "Dataset2");
+    dataset2=H5Dopen2(file, "Dataset2", H5P_DEFAULT);
 
     /* Get the OID of the attribute */
     attr=H5Aopen(dataset1, ".", "Foo", H5P_DEFAULT, H5P_DEFAULT);
diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c
index 1581a88..b49b0e1 100644
--- a/examples/h5_attribute.c
+++ b/examples/h5_attribute.c
@@ -178,7 +178,7 @@ main (void)
    /*
     * Open the dataset.
     */
-   dataset = H5Dopen(file,"Dataset");
+   dataset = H5Dopen2(file, "Dataset", H5P_DEFAULT);
 
    /*
     * Attach to the scalar attribute using attribute name, then read and
diff --git a/examples/h5_chunk_read.c b/examples/h5_chunk_read.c
index fb018f3..98b0bb4 100644
--- a/examples/h5_chunk_read.c
+++ b/examples/h5_chunk_read.c
@@ -55,7 +55,7 @@ main (void)
      * Open the file and the dataset.
      */
     file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
-    dataset = H5Dopen(file, DATASETNAME);
+    dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
     /*
      * Get dataset rank and dimension.
diff --git a/examples/h5_compound.c b/examples/h5_compound.c
index 544a239..da22c87 100644
--- a/examples/h5_compound.c
+++ b/examples/h5_compound.c
@@ -107,7 +107,7 @@ main(void)
      */
     file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
 
-    dataset = H5Dopen(file, DATASETNAME);
+    dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
     /*
      * Create a data type for s2
diff --git a/examples/h5_group.c b/examples/h5_group.c
index 744f7b8..f0adff7 100644
--- a/examples/h5_group.c
+++ b/examples/h5_group.c
@@ -106,7 +106,7 @@ main(void)
     /*
      * Access "Compressed_Data" dataset in the group.
      */
-    dataset = H5Dopen(grp, "Compressed_Data");
+    dataset = H5Dopen2(grp, "Compressed_Data", H5P_DEFAULT);
     if( dataset < 0) printf(" Dataset 'Compressed-Data' is not found. \n");
     printf("\"/Data/Compressed_Data\" dataset is open \n");
 
@@ -124,7 +124,7 @@ main(void)
      * We can access "Compressed_Data" dataset using created
      * hard link "Data_new".
      */
-    dataset = H5Dopen(file, "/Data_new/Compressed_Data");
+    dataset = H5Dopen2(file, "/Data_new/Compressed_Data", H5P_DEFAULT);
     if( dataset < 0) printf(" Dataset is not found. \n");
     printf("\"/Data_new/Compressed_Data\" dataset is open \n");
 
@@ -207,7 +207,7 @@ group_info(hid_t loc_id, const char *name, const H5L_info_t *linfo, void *opdata
     /*
      * Open the datasets using their names.
      */
-    did = H5Dopen(loc_id, name);
+    did = H5Dopen2(loc_id, name, H5P_DEFAULT);
 
     /*
      * Display dataset name.
diff --git a/examples/h5_mount.c b/examples/h5_mount.c
index 04c6184..6c4910c 100644
--- a/examples/h5_mount.c
+++ b/examples/h5_mount.c
@@ -97,7 +97,7 @@ int main(void)
    /*
     * Access dataset D in the first file under /G/D name.
     */
-   did = H5Dopen(fid1,"/G/D");
+   did = H5Dopen2(fid1, "/G/D", H5P_DEFAULT);
    tid = H5Dget_type(did);
    status = H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm_out);
 
diff --git a/examples/h5_read.c b/examples/h5_read.c
index 2d90f02..6fe75be 100644
--- a/examples/h5_read.c
+++ b/examples/h5_read.c
@@ -67,7 +67,7 @@ main (void)
      * Open the file and the dataset.
      */
     file = H5Fopen(H5FILE_NAME, H5F_ACC_RDONLY, H5P_DEFAULT);
-    dataset = H5Dopen(file, DATASETNAME);
+    dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT);
 
     /*
      * Get datatype and dataspace handles and then query
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index d5d24de..1459161 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -123,7 +123,7 @@ int main(void)
      * Reopen the dataset with object references and read references 
      * to the buffer.
      */
-    dsetr_id = H5Dopen (file_id, dsetnamer);
+    dsetr_id = H5Dopen2(file_id, dsetnamer, H5P_DEFAULT);
 
     status = H5Dread(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, 
                    H5P_DEFAULT, ref_out);
diff --git a/examples/h5_reference.c b/examples/h5_reference.c
index 002d753..3bd1ab3 100644
--- a/examples/h5_reference.c
+++ b/examples/h5_reference.c
@@ -112,7 +112,7 @@ main(void) {
    /*
     *  Open and read dataset "R".
     */
-   did_r  = H5Dopen(fid, "R");
+   did_r  = H5Dopen2(fid, "R", H5P_DEFAULT);
    status = H5Dread(did_r, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL,
 		    H5P_DEFAULT, rbuf);
 
diff --git a/examples/h5_select.c b/examples/h5_select.c
index 249f2ba..d39458f 100644
--- a/examples/h5_select.c
+++ b/examples/h5_select.c
@@ -216,7 +216,7 @@ main (void)
     /*
      * Open the dataset.
      */
-    dataset = H5Dopen(file,"Matrix in file");
+    dataset = H5Dopen2(file, "Matrix in file", H5P_DEFAULT);
 
     /*
      * Get dataspace of the open dataset.
diff --git a/examples/ph5example.c b/examples/ph5example.c
index cc70d40..851536a 100644
--- a/examples/ph5example.c
+++ b/examples/ph5example.c
@@ -404,11 +404,11 @@ phdf5readInd(char *filename)
     assert(ret != FAIL);
 
     /* open the dataset1 collectively */
-    dataset1 = H5Dopen(fid1, DATASETNAME1);
+    dataset1 = H5Dopen2(fid1, DATASETNAME1, H5P_DEFAULT);
     assert(dataset1 != FAIL);
 
     /* open another dataset collectively */
-    dataset2 = H5Dopen(fid1, DATASETNAME1);
+    dataset2 = H5Dopen2(fid1, DATASETNAME1, H5P_DEFAULT);
     assert(dataset2 != FAIL);
 
 
@@ -731,14 +731,14 @@ phdf5readAll(char *filename)
      * Open the datasets in it
      * ------------------------- */
     /* open the dataset1 collectively */
-    dataset1 = H5Dopen(fid1, DATASETNAME1);
+    dataset1 = H5Dopen2(fid1, DATASETNAME1, H5P_DEFAULT);
     assert(dataset1 != FAIL);
-    MESG("H5Dopen succeed");
+    MESG("H5Dopen2 succeed");
 
     /* open another dataset collectively */
-    dataset2 = H5Dopen(fid1, DATASETNAME1);
+    dataset2 = H5Dopen2(fid1, DATASETNAME1, H5P_DEFAULT);
     assert(dataset2 != FAIL);
-    MESG("H5Dopen 2 succeed");
+    MESG("H5Dopen2 2 succeed");
 
     /*
      * Set up dimensions of the slab this process accesses.