8 files changed, 10 insertions, 10 deletions
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index fa37059..feb946b 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -72,7 +72,7 @@ hid_t Attribute::p_getType() const
       return( type_id );
    else
    {
-      throw AttributeIException(NULL, "H5Aget_type failed");
+      throw AttributeIException(0, "H5Aget_type failed");
    }
 }
 
@@ -111,7 +111,7 @@ void Attribute::p_close() const
    herr_t ret_value = H5Aclose( id );
    if( ret_value < 0 )
    {
-      throw AttributeIException(NULL, "H5Aclose failed");
+      throw AttributeIException(0, "H5Aclose failed");
    }
 }
 
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 0f91298..9817b17 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -55,7 +55,7 @@ hid_t DataSet::p_getType() const
       return( type_id );
    else
    {
-      throw DataSetIException(NULL, "H5Dget_type failed");
+      throw DataSetIException(0, "H5Dget_type failed");
    }
 }
 
@@ -187,7 +187,7 @@ void DataSet::p_close() const
    herr_t ret_value = H5Dclose( id );
    if( ret_value < 0 )
    {
-      throw DataSetIException(NULL, "H5Dclose failed");
+      throw DataSetIException(0, "H5Dclose failed");
    }
 }
 
diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp
index 4e9533f..e129565 100644
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@@ -326,7 +326,7 @@ void DataSpace::p_close() const
       herr_t ret_value = H5Sclose( space_id );
       if( ret_value < 0 )
       {
-         throw DataSpaceIException(NULL, "H5Sclose failed");
+         throw DataSpaceIException(0, "H5Sclose failed");
       }
    }
 }
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index bef66f3..fad6436 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -322,7 +322,7 @@ void DataType::p_close() const
       herr_t ret_value = H5Tclose( id );
       if( ret_value < 0 )
       {
-         throw DataTypeIException(NULL, "H5Tclose failed");
+         throw DataTypeIException(0, "H5Tclose failed");
       }
    }
 }
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index dc55844..308d958 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -15,7 +15,7 @@ class __DLLCPP__ Exception {
 
 	// Creates an exception with a function name where the failure occurs
 	// and an optional detailed message
-	Exception( const string& func_name, const string& message = NULL);
+	Exception( const string& func_name, const string& message = 0);
 	Exception( const char* func_name, const char* message = NULL);
 
 	// copy constructor
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 9a668c4..4b92806 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -155,7 +155,7 @@ void H5File::p_close() const
    herr_t ret_value = H5Fclose( id );
    if( ret_value < 0 )
    {
-      throw FileIException(NULL, "H5Fclose failed");
+      throw FileIException(0, "H5Fclose failed");
    }
 }
 
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index 52fb816..6c818ad 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -61,7 +61,7 @@ void Group::p_close() const
    herr_t ret_value = H5Gclose( id );
    if( ret_value < 0 )
    {
-      throw GroupIException(NULL, "H5Gclose failed");
+      throw GroupIException(0, "H5Gclose failed");
    }
 }
 
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 7adfda8..b749014 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -104,7 +104,7 @@ void PropList::p_close() const
       herr_t ret_value = H5Pclose( id );
       if( ret_value < 0 )
       {
-         throw PropListIException(NULL, "property list close failed" );
+         throw PropListIException(0, "property list close failed" );
       }
    }
 }