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

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

1 files changed, 14 insertions, 2 deletions

diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index e015825..79a8d5c 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -138,13 +138,21 @@ class H5_DLLCPP H5Location : public IdComponent {
 	// Default constructor
 	H5Location();
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+	// *** 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.
+
 	// Creates a copy of an existing object giving the location id.
 	H5Location(const hid_t loc_id);
 
 	// Copy constructor.
-	H5Location(const H5Location& original);
+	// H5Location(const H5Location& original);
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 	// Creates a reference to an HDF5 object or a dataset region.
 	void p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const;
 
@@ -159,6 +167,10 @@ class H5_DLLCPP H5Location : public IdComponent {
 	// Retrieves the type of object that an object reference points to.
 	H5O_type_t p_get_ref_obj_type(void *ref, H5R_type_t ref_type) const;
 
+        // Sets the identifier of this object to a new value. - this one
+        // doesn't increment reference count
+        virtual void p_setId(const hid_t new_id) = 0;
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 	// Noop destructor.