Final merge of page buffering branch to develop

4 files changed, 19 insertions, 1 deletions

diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 6701f6e..c506906 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -1,7 +1,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
  * Copyright by the Board of Trustees of the University of Illinois.         *
-/* All rights reserved.                                                      *
+ * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index c490f26..ea69049 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -294,6 +294,7 @@ unsigned FileCreatPropList::getIstorek() const
     return(ik);
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:    FileCreatPropList::setFileSpace
 ///\brief       Sets the strategy and the threshold value that the library
@@ -364,6 +365,7 @@ hsize_t FileCreatPropList::getFileSpaceThreshold() const
     }
     return(threshold);
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:    FileCreatPropList destructor
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 1bbaabf..1d999cb 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -65,6 +65,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
         // indexing chunked datasets.
         void setIstorek(unsigned ik) const;
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
         // Sets the strategy and the threshold value that the library will
         // will employ in managing file space.
         void setFileSpace(H5F_file_space_type_t strategy, hsize_t threshold) const;
@@ -75,6 +76,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
         // Returns the threshold value that the library uses in tracking free
         // space sections.
         hsize_t getFileSpaceThreshold() const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
         ///\brief Returns this class name.
         virtual H5std_string fromClass() const { return("FileCreatPropList"); }
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 261beab..eb07657 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -817,12 +817,14 @@ static void test_file_info()
     // Output message about test being performed
     SUBTEST("File general information");
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
     hsize_t in_threshold = 2;   // Free space section threshold to set */
     hsize_t out_threshold = 0;  // Free space section threshold to get */
     // File space handling strategy
     H5F_file_space_type_t in_strategy = H5F_FILE_SPACE_ALL;
     // File space handling strategy
     H5F_file_space_type_t out_strategy = H5F_FILE_SPACE_DEFAULT;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
     try {
         // Create a file using default properties.
@@ -846,7 +848,9 @@ static void test_file_info()
         fcpl.setSizes(F2_OFFSET_SIZE, F2_LENGTH_SIZE);
         fcpl.setSymk(F2_SYM_INTERN_K, F2_SYM_LEAF_K);
         fcpl.setIstorek(F2_ISTORE);
+#ifndef H5_NO_DEPRECATED_SYMBOLS
         fcpl.setFileSpace(in_strategy, in_threshold);
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
         // Creating a file with the non-default file creation property list
         // should create a version 1 superblock
@@ -859,7 +863,11 @@ static void test_file_info()
 
         // Get the file's version information.
         file7.getFileInfo(finfo);
+#ifndef H5_NO_DEPRECATED_SYMBOLS
         verify_val(finfo.super.version, 2, "H5File::getFileInfo", __LINE__, __FILE__);
+#else /* H5_NO_DEPRECATED_SYMBOLS */
+        verify_val(finfo.super.version, 1, "H5File::getFileInfo", __LINE__, __FILE__);
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
         verify_val(finfo.free.version, 0, "H5File::getFileInfo", __LINE__, __FILE__);
         verify_val(finfo.sohm.version, 0, "H5File::getFileInfo", __LINE__, __FILE__);
 
@@ -874,7 +882,11 @@ static void test_file_info()
 
         // Get the file's version information.
         file7.getFileInfo(finfo);
+#ifndef H5_NO_DEPRECATED_SYMBOLS
         verify_val(finfo.super.version, 2, "H5File::getFileInfo", __LINE__, __FILE__);
+#else /* H5_NO_DEPRECATED_SYMBOLS */
+        verify_val(finfo.super.version, 1, "H5File::getFileInfo", __LINE__, __FILE__);
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
         verify_val(finfo.free.version, 0, "H5File::getFileInfo", __LINE__, __FILE__);
         verify_val(finfo.sohm.version, 0, "H5File::getFileInfo", __LINE__, __FILE__);
 
@@ -900,12 +912,14 @@ static void test_file_info()
     VERIFY(nindexes, MISC11_NINDEXES, "H5Pget_shared_mesg_nindexes");
  */ 
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
         // Get and verify the file space info from the creation property list */
         out_strategy = fcpl2.getFileSpaceStrategy();
         verify_val(static_cast<unsigned>(out_strategy), static_cast<unsigned>(in_strategy), "FileCreatPropList::getFileSpaceStrategy", __LINE__, __FILE__);
 
         out_threshold = fcpl2.getFileSpaceThreshold();
         verify_val(static_cast<unsigned>(out_threshold), static_cast<unsigned>(in_threshold), "FileCreatPropList::getFileSpaceThreshold", __LINE__, __FILE__);
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
         PASSED();
     }   // end of try block