[svn-r28049] Merge of r27997-28047 from the trunk.

Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
           serial w/ Fortran and C++
           parallel (MPICH 3.1.4) w/ Fortran

1 files changed, 5 insertions, 5 deletions

diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index 68ab039..336f9c8 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -29,6 +29,11 @@ namespace H5 {
 */
 class H5_DLLCPP H5Library {
    public:
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+        static bool need_cleanup; // indicates if H5close should be called
+                             // - unused, will be removed in future releases.
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
 	// Initializes the HDF5 library.
 	static void open();
 
@@ -60,15 +65,10 @@ class H5_DLLCPP H5Library {
         // Sends request for terminating the HDF5 library.
         static void termH5cpp(void);
 
-        static H5Library* getInstance();
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
    private:
 
-        // private instance to be created by H5Library only
-        static H5Library* instance;
-
         // Default constructor - no instance ever created from outsiders
         H5Library();