8 files changed, 42 insertions, 13 deletions
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 3d642a0..09e53d3 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
@@ -140,7 +145,7 @@ Attribute::~Attribute()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw AttributeIException("Attribute::~Attribute", close_error.getDetailMsg());
+        cerr << "Attribute::~Attribute" << close_error.getDetailMsg() << endl;
     }
 }
 
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 81370fa..5eb640c 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5RefCounter.h"
@@ -257,7 +262,7 @@ DataSet::~DataSet()
     try {
 	resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-	throw DataSetIException("DataSet::~DataSet", close_error.getDetailMsg());
+        cerr << "DataSet::~DataSet" << close_error.getDetailMsg() << endl;
     }
 }
 
diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp
index 7f90d6e..091fa10 100644
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5Exception.h"
@@ -356,7 +361,7 @@ DataSpace::~DataSpace()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw DataSpaceIException("DataSpace::~DataSpace", close_error.getDetailMsg());
+        cerr << "DataSpace::~DataSpace" << close_error.getDetailMsg() << endl;
     }
 }  
 
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 05677a4..aba1949 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5RefCounter.h"
@@ -352,7 +357,7 @@ DataType::~DataType()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw DataTypeIException("DataType::~DataType", close_error.getDetailMsg());
+        cerr << "DataType::~DataType" << close_error.getDetailMsg() << endl;
     }
 }  
 
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index c61e252..d493662 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -12,12 +12,6 @@
   * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifdef OLD_HEADER_FILENAME
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
 #include "H5Include.h"
 #include "H5Exception.h"
 
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 228f804..a314693 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5RefCounter.h"
@@ -198,7 +203,7 @@ H5File::~H5File()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw FileIException("H5File::~H5File", close_error.getDetailMsg());
+        cerr << "H5File::~H5File" << close_error.getDetailMsg() << endl;
     }
 }  
 
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index b8cc4a4..f805778 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5RefCounter.h"
@@ -151,7 +156,7 @@ Group::~Group()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw GroupIException("Group::~Group", close_error.getDetailMsg());
+        cerr << "Group::~Group" << close_error.getDetailMsg() << endl;
     }
 
 }  
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 3f12be6..dbc56d1 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -13,6 +13,11 @@
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <string>
+#ifdef OLD_HEADER_FILENAME
+#include <iostream.h>
+#else
+#include <iostream>
+#endif
 
 #include "H5Include.h"
 #include "H5RefCounter.h"
@@ -143,7 +148,7 @@ PropList::~PropList()
     try {
         resetIdComponent( this ); }
     catch (Exception close_error) { // thrown by p_close
-        throw PropListIException("PropList::~PropList", close_error.getDetailMsg());
+        cerr << "PropList::~PropList" << close_error.getDetailMsg() << endl;
     }
 }