26 files changed, 37 insertions, 37 deletions

diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 1886903..7d8ea94 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -10,7 +10,7 @@
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
 #endif
-class __DLLCPP__ AbstractDs : public H5Object {
+class H5_DLLCPP AbstractDs : public H5Object {
    public:
 	// Gets the dataspace of this abstract dataset - pure virtual
 	virtual DataSpace getSpace() const = 0;
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 23a5e17..61814aa 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -10,7 +10,7 @@
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
 #endif
-class __DLLCPP__ AtomType : public DataType {
+class H5_DLLCPP AtomType : public DataType {
    public:
 	// Sets the total size for an atomic datatype. 
 	void setSize( size_t size ) const;
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index b9bb70c..e7f4fff 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ Attribute : public AbstractDs {
+class H5_DLLCPP Attribute : public AbstractDs {
    public:
 	// Writes data to this attribute.
 	void write(const DataType& mem_type, const void *buf ) const;
diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index e42bf73..4b598af 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -12,7 +12,7 @@ namespace H5 {
 
 class Group;
 class H5File;
-class __DLLCPP__ CommonFG {
+class H5_DLLCPP CommonFG {
    public:
 	// Creates a new group at this location which can be a file or another group.
 	Group createGroup( const string& name, size_t size_hint = 0 ) const;
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index 42cd913..928d96e 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -9,7 +9,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ CompType : public DataType {
+class H5_DLLCPP CompType : public DataType {
    public:
 	// Creates a new compound datatype, given the type's size
 	CompType( size_t size ); // H5Tcreate
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index dba39b0..92040c4 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -8,7 +8,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ DataSet : public AbstractDs {
+class H5_DLLCPP DataSet : public AbstractDs {
    public:
 	// Gets the dataspace of this dataset.
 	virtual DataSpace getSpace() const;
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 5ec7842..3e6aeac 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ DataSpace : public IdComponent {
+class H5_DLLCPP DataSpace : public IdComponent {
    public:
 	// Default DataSpace objects
 	static const DataSpace ALL;
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 2d70bda..b850123 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ DataType : public H5Object {
+class H5_DLLCPP DataType : public H5Object {
    public:
 	// Creates a datatype given its class and size
 	DataType( const H5T_class_t type_class, size_t size );
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 759c6ce..2c8cc00 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ DSetCreatPropList : public PropList {
+class H5_DLLCPP DSetCreatPropList : public PropList {
    public:
 	static const DSetCreatPropList DEFAULT;
 
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index b1740b6..aa911a4 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ DSetMemXferPropList : public PropList {
+class H5_DLLCPP DSetMemXferPropList : public PropList {
    public:
 	static const DSetMemXferPropList DEFAULT;
 
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index db4bbbb..9bbaa92 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ EnumType : public DataType {
+class H5_DLLCPP EnumType : public DataType {
 
    public:
 	// Creates an empty enumeration datatype based on a native signed 
diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h
index a5e0f91..15756a7 100644
--- a/c++/src/H5Exception.h
+++ b/c++/src/H5Exception.h
@@ -8,7 +8,7 @@ namespace H5 {
 using namespace std;
 #endif
 
-class __DLLCPP__ Exception {
+class H5_DLLCPP Exception {
    public:
 	// Default constructor
 	Exception();
@@ -70,7 +70,7 @@ class __DLLCPP__ Exception {
 	string funcName;
 };
 
-class __DLLCPP__ FileIException : public Exception {
+class H5_DLLCPP FileIException : public Exception {
    public:
 	FileIException();
 	FileIException( const string& func_name, const string& message = NULL);
@@ -78,7 +78,7 @@ class __DLLCPP__ FileIException : public Exception {
 	virtual ~FileIException();
 };
 
-class __DLLCPP__ GroupIException : public Exception {
+class H5_DLLCPP GroupIException : public Exception {
    public:
 	GroupIException();
 	GroupIException( const string& func_name, const string& message=NULL);
@@ -86,7 +86,7 @@ class __DLLCPP__ GroupIException : public Exception {
 	virtual ~GroupIException();
 };
 
-class __DLLCPP__ DataSpaceIException : public Exception {
+class H5_DLLCPP DataSpaceIException : public Exception {
    public:
 	DataSpaceIException();
 	DataSpaceIException(const string& func_name, const string& message=NULL);
@@ -94,7 +94,7 @@ class __DLLCPP__ DataSpaceIException : public Exception {
 	virtual ~DataSpaceIException();
 };
 
-class __DLLCPP__ DataTypeIException : public Exception {
+class H5_DLLCPP DataTypeIException : public Exception {
    public:
 	DataTypeIException();
 	DataTypeIException(const string& func_name, const string& message = NULL);
@@ -102,7 +102,7 @@ class __DLLCPP__ DataTypeIException : public Exception {
 	virtual ~DataTypeIException();
 };
 
-class __DLLCPP__ PropListIException : public Exception {
+class H5_DLLCPP PropListIException : public Exception {
    public:
 	PropListIException();
 	PropListIException(const string& func_name, const string& message=NULL);
@@ -110,7 +110,7 @@ class __DLLCPP__ PropListIException : public Exception {
 	virtual ~PropListIException();
 };
 
-class __DLLCPP__ DataSetIException : public Exception {
+class H5_DLLCPP DataSetIException : public Exception {
    public:
 	DataSetIException();
 	DataSetIException(const string& func_name, const string& message=NULL);
@@ -118,7 +118,7 @@ class __DLLCPP__ DataSetIException : public Exception {
 	virtual ~DataSetIException();
 };
 
-class __DLLCPP__ AttributeIException : public Exception {
+class H5_DLLCPP AttributeIException : public Exception {
    public:
 	AttributeIException();
 	AttributeIException(const string& func_name, const string& message=NULL);
@@ -126,7 +126,7 @@ class __DLLCPP__ AttributeIException : public Exception {
 	virtual ~AttributeIException();
 };
 
-class __DLLCPP__ ReferenceException : public Exception {
+class H5_DLLCPP ReferenceException : public Exception {
    public:
 	ReferenceException();
 	ReferenceException(const string& func_name, const string& message=NULL);
@@ -134,7 +134,7 @@ class __DLLCPP__ ReferenceException : public Exception {
 	virtual ~ReferenceException();
 };
 
-class __DLLCPP__ LibraryIException : public Exception {
+class H5_DLLCPP LibraryIException : public Exception {
    public:
 	LibraryIException();
 	LibraryIException(const string& func_name, const string& message=NULL);
@@ -142,7 +142,7 @@ class __DLLCPP__ LibraryIException : public Exception {
 	virtual ~LibraryIException();
 };
 
-class __DLLCPP__ IdComponentException : public Exception {
+class H5_DLLCPP IdComponentException : public Exception {
    public:
 	IdComponentException();
 	IdComponentException(const string& func_name, const string& message=NULL);
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index c7884f7..0c9eb36 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -7,7 +7,7 @@ namespace H5 {
 #endif
 
 // class for file access properties
-class __DLLCPP__ FileAccPropList : public PropList {
+class H5_DLLCPP FileAccPropList : public PropList {
    public:
 	static const FileAccPropList DEFAULT;
 
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 2a65b0c..5bb1420 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -7,7 +7,7 @@ namespace H5 {
 #endif
 
 // class for file access properties
-class __DLLCPP__ FileCreatPropList : public PropList {
+class H5_DLLCPP FileCreatPropList : public PropList {
    public:
 	static const FileCreatPropList DEFAULT;
 	
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index ee7017f..e787506 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ H5File : public IdComponent, public CommonFG {
+class H5_DLLCPP H5File : public IdComponent, public CommonFG {
    public:
 	// Default constructor
 	H5File();
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index a6d21e3..af3d8b3 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ FloatType : public AtomType {
+class H5_DLLCPP FloatType : public AtomType {
    public:
 	// default constructor
 	FloatType();
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 2fe7fd6..d58c918 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ Group : public H5Object, public CommonFG {
+class H5_DLLCPP Group : public H5Object, public CommonFG {
    public:
 	// default constructor
 	Group();
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index 08f2dac..6e9c168 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -9,7 +9,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ IdComponent {
+class H5_DLLCPP IdComponent {
    public:
 	// Parent classes must reset the current IdComponent copy
 	// before setting new id to control reference count
diff --git a/c++/src/H5Idtemplates.h b/c++/src/H5Idtemplates.h
index dbf5348..bc7218a 100644
--- a/c++/src/H5Idtemplates.h
+++ b/c++/src/H5Idtemplates.h
@@ -13,7 +13,7 @@ namespace H5 {
 // a member function so it can be template to work around that problem.
 
 template <class Type>
-__DLLCPP__ void resetIdComponent( 
+H5_DLLCPP void resetIdComponent( 
 	Type* obj )	// pointer to object to be reset
 {
    if( obj->noReference())  // ref count of this object is decremented here
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index 5635946..c6348b5 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -5,7 +5,7 @@
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
 #endif
-class __DLLCPP__ IntType : public AtomType {
+class H5_DLLCPP IntType : public AtomType {
    public:
 
 	// default constructor
diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h
index f0d2e02..7f431c4 100644
--- a/c++/src/H5Library.h
+++ b/c++/src/H5Library.h
@@ -12,7 +12,7 @@ namespace H5 {
 	// It is not even working, inifiteloop message still printed when
 	// calling H5close
 
-class __DLLCPP__ H5Library {
+class H5_DLLCPP H5Library {
    public:
 	static bool need_cleanup; // indicates if H5close should be called
 
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index e02c3b3..9605db0 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -13,7 +13,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ H5Object;  // forward declaration for UserData4Aiterate
+class H5_DLLCPP H5Object;  // forward declaration for UserData4Aiterate
 
 // Define the operator function pointer for H5Aiterate().
 typedef void (*attr_operator_t)( H5Object& loc/*in*/, 
@@ -30,7 +30,7 @@ class UserData4Aiterate { // user data for attribute iteration
 
 // The above part is being moved into Iterator, but not completed
 
-class __DLLCPP__ H5Object : public IdComponent {
+class H5_DLLCPP H5Object : public IdComponent {
    public:
 	// Pure virtual function so appropriate close function can 
 	// be called by subclasses' for the corresponding HDF5 object
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index 3172d86..88b87bd 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -11,7 +11,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ PredType : public AtomType {
+class H5_DLLCPP PredType : public AtomType {
    public:
 	// Default destructor
 	virtual ~PredType();
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index 186bf22..cbc75fb 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ PropList : public IdComponent {
+class H5_DLLCPP PropList : public IdComponent {
    public:
 	// Default property list
         static const PropList DEFAULT;
diff --git a/c++/src/H5RefCounter.h b/c++/src/H5RefCounter.h
index f4ebc40..e30fae3 100644
--- a/c++/src/H5RefCounter.h
+++ b/c++/src/H5RefCounter.h
@@ -22,7 +22,7 @@ const bool  true  = 1;
 
 #endif
 
-class __DLLCPP__ RefCounter {
+class H5_DLLCPP RefCounter {
    public:
 	// Creates a reference counter to be used by an HDF5 object
 	RefCounter();
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 871d323..4cd6cdf 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -6,7 +6,7 @@
 namespace H5 {
 #endif
 
-class __DLLCPP__ StrType : public AtomType {
+class H5_DLLCPP StrType : public AtomType {
    public:
 	// default constructor 
 	StrType();