Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'd0aeefd6455d6877afd934e238362636a86e4b42':
  Final merge of page buffering branch to develop

3 files changed, 5 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"); }