[svn-r27038] Merge of r26393-27031 from the trunk.

Tested on 64-bit linux VM w/ C++ and Fortran 2003

1 files changed, 12 insertions, 5 deletions

diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 01d05b8..810dc8b 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -28,6 +28,7 @@ class FloatType;
 class IntType;
 class StrType;
 class VarLenType;
+class DataSpace;
 
 /*! \class AbstractDs
     \brief AbstractDs is an abstract base class, inherited by Attribute
@@ -70,9 +71,6 @@ class H5_DLLCPP AbstractDs {
 	///\brief Returns this class name.
 	virtual H5std_string fromClass() const = 0;
 
-	// Copy constructor
-	AbstractDs( const AbstractDs& original );
-
 	// Destructor
 	virtual ~AbstractDs();
 
@@ -80,8 +78,17 @@ class H5_DLLCPP AbstractDs {
 	// Default constructor
 	AbstractDs();
 
-	// Constructor that takes an attribute id or a dataset id.
-	AbstractDs( const hid_t ds_id );
+        // *** Deprecation warning ***
+        // The following two constructors are no longer appropriate after the
+        // data member "id" had been moved to the sub-classes.
+        // The copy constructor is a noop and is removed in 1.8.15 and the
+        // other will be removed from 1.10 release, and then from 1.8 if its
+        // removal does not raise any problems in two 1.10 releases.
+
+	AbstractDs(const hid_t h5_id);
+
+	// Copy constructor
+	// AbstractDs( const AbstractDs& original );
 
    private:
 	// This member function is implemented by DataSet and Attribute.