deleting Attribute_priv header, now included in the Attribute header

include/hdf4cpp/HdfAttribute.h

@@ -5,18 +5,93 @@
 #define HDF4CPP_HDFATTRIBUTE_H
 
 #include <hdf/hdfi.h>
-#include <hdf4cpp/HdfObject.h>
 #include <hdf4cpp/HdfItem.h>
+#include <hdf4cpp/HdfObject.h>
 
 namespace hdf4cpp {
 
 /// Represents an hdf attribute
 class HdfAttribute : public HdfObject {
+  private:
+    /// The base class of the attribute classes
+    class HdfAttributeBase : public HdfObject {
+      public:
+        HdfAttributeBase(int32 id, int32 index, Type type, const HdfDestroyerChain &chain)
+            : HdfObject(type, ATTRIBUTE, chain)
+            , id(id)
+            , index(index) {
+            if (id == FAIL || index == FAIL) {
+                raiseException(INVALID_ID);
+            }
+        }
+        virtual ~HdfAttributeBase() {
+        }
+
+        /// \returns The number of existing data in the attribute
+        virtual intn size() const = 0;
+
+        /// \returns The data type number of the data held by the attribute
+        virtual int32 getDataType() const = 0;
+
+        /// Reads the data from the attribute
+        /// \param dest The destination vector
+        virtual void get(void *dest) = 0;
+
+      protected:
+        int32 id;
+
+        int32 index;
+    };
+
+    /// Attribute class for the SData attributes
+    class HdfDatasetAttribute : public HdfAttributeBase {
+      public:
+        HdfDatasetAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
+
+        intn size() const;
+
+      private:
+        intn _size;
+        int32 dataType;
+
+        void get(void *dest);
+        int32 getDataType() const;
+    };
+
+    /// Attribute class for the VGroup attributes
+    class HdfGroupAttribute : public HdfAttributeBase {
+      public:
+        HdfGroupAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
+
+        intn size() const;
+
+      private:
+        intn _size;
+        int32 dataType;
+
+        void get(void *dest);
+        int32 getDataType() const;
+    };
+
+    /// Attribute class for the VData attributes
+    class HdfDataAttribute : public HdfAttributeBase {
+      public:
+        HdfDataAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
+
+        intn size() const;
+
+      private:
+        intn _size;
+        int32 dataType;
+        void get(void *dest);
+        int32 getDataType() const;
+    };
+
   public:
-    HdfAttribute(const HdfAttribute&) = delete;
-    HdfAttribute(HdfAttribute&& attr);
-    HdfAttribute& operator=(const HdfAttribute& attribute) = delete;
-    HdfAttribute& operator=(HdfAttribute&& attribute);
+    HdfAttribute(const HdfAttribute &) = delete;
+    HdfAttribute(HdfAttribute &&attr);
+    HdfAttribute &operator=(const HdfAttribute &attribute) = delete;
+    HdfAttribute &operator=(HdfAttribute &&attribute);
     /// \returns the number of elements of the attribute data
     intn size() const;
 
@@ -42,11 +117,6 @@ class HdfAttribute : public HdfObject {
     friend HdfAttribute HdfItem::HdfDataItem::getAttribute(const std::string &name) const;
 
   private:
-    class HdfAttributeBase;
-    class HdfDatasetAttribute;
-    class HdfGroupAttribute;
-    class HdfDataAttribute;
-
     HdfAttribute(HdfAttributeBase *attribute);
 
     /// An internal get function
@@ -58,4 +128,4 @@ class HdfAttribute : public HdfObject {
 };
 }
 
-#endif //HDF4CPP_HDFATTRIBUTE_H
+#endif // HDF4CPP_HDFATTRIBUTE_H

include/hdf4cpp/HdfAttribute_priv.h

@@ -1,96 +0,0 @@
-/// \copyright Copyright (c) Catalysts GmbH
-/// \author Patrik Kovacs, Catalysts GmbH
-
-
-#ifndef HDF4CPP_HDFATTRIBUTE_PRIV_H
-#define HDF4CPP_HDFATTRIBUTE_PRIV_H
-
-#include <hdf4cpp/HdfAttribute.h>
-#include <hdf4cpp/HdfException.h>
-#include <hdf4cpp/HdfObject.h>
-
-#include <hdf/hdf.h>
-#include <hdf/mfhdf.h>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace hdf4cpp {
-
-/// The base class of the attribute classes
-class HdfAttribute::HdfAttributeBase : public HdfObject {
-  public:
-    HdfAttributeBase(int32 id, int32 index, Type type, const HdfDestroyerChain &chain)
-        : HdfObject(type, ATTRIBUTE, chain)
-        , id(id)
-        , index(index) {
-        if (id == FAIL || index == FAIL) {
-            raiseException(INVALID_ID);
-        }
-    }
-    virtual ~HdfAttributeBase() {
-    }
-
-    /// \returns The number of existing data in the attribute
-    virtual intn size() const = 0;
-
-    /// \returns The data type number of the data held by the attribute
-    virtual int32 getDataType() const = 0;
-
-    /// Reads the data from the attribute
-    /// \param dest The destination vector
-    virtual void get(void *dest) = 0;
-
-  protected:
-    int32 id;
-
-    int32 index;
-};
-
-/// Attribute class for the SData attributes
-class HdfAttribute::HdfDatasetAttribute : public HdfAttributeBase {
-  public:
-    HdfDatasetAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
-
-    intn size() const;
-
-  private:
-    intn _size;
-    int32 dataType;
-
-    void get(void *dest);
-    int32 getDataType() const;
-};
-
-/// Attribute class for the VGroup attributes
-class HdfAttribute::HdfGroupAttribute : public HdfAttributeBase {
-  public:
-    HdfGroupAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
-
-    intn size() const;
-
-  private:
-    intn _size;
-    int32 dataType;
-
-    void get(void *dest);
-    int32 getDataType() const;
-};
-
-/// Attribute class for the VData attributes
-class HdfAttribute::HdfDataAttribute : public HdfAttributeBase {
-  public:
-    HdfDataAttribute(int32 id, const std::string &name, const HdfDestroyerChain &chain);
-
-    intn size() const;
-
-  private:
-    intn _size;
-    int32 dataType;
-    void get(void *dest);
-    int32 getDataType() const;
-};
-}
-
-#endif // HDF4CPP_HDFATTRIBUTE_PRIV_H

lib/HdfAttribute.cpp

@@ -2,8 +2,8 @@
 /// \author Patrik Kovacs, Catalysts GmbH
 
 
-#include <hdf4cpp/HdfAttribute_priv.h>
 #include <hdf4cpp/HdfDefines.h>
+#include <hdf4cpp/HdfAttribute.h>
 #include <stdexcept>
 
 using namespace hdf4cpp;

lib/HdfFile.cpp

@@ -5,11 +5,11 @@
 #include <hdf/mfhdf.h>
 #include <stdexcept>
 
-#include <hdf4cpp/HdfAttribute_priv.h>
 #include <hdf4cpp/HdfDefines.h>
 #include <hdf4cpp/HdfException.h>
 #include <hdf4cpp/HdfFile.h>
 #include <hdf4cpp/HdfItem.h>
+#include <hdf4cpp/HdfAttribute.h>
 
 
 hdf4cpp::HdfFile::HdfFile(const std::string &path)

lib/HdfItem.cpp

@@ -3,10 +3,10 @@
 
 
 #include <hdf/mfhdf.h>
-#include <hdf4cpp/HdfAttribute_priv.h>
 #include <hdf4cpp/HdfFile.h>
 #include <hdf4cpp/HdfItem.h>
 #include <sstream>
+#include <hdf4cpp/HdfAttribute.h>
 
 hdf4cpp::HdfItem::HdfDatasetItem::HdfDatasetItem(int32 id, const HdfDestroyerChain &chain)
     : HdfItemBase(id, SDATA, chain) {

tests/HdfFileTest.cpp

@@ -3,7 +3,6 @@
 
 
 #include <gtest/gtest.h>
-#include <hdf4cpp/HdfAttribute_priv.h>
 #include <hdf4cpp/HdfFile.h>
 #include <hdf4cpp/HdfItem.h>