Fix tests and compiling in MSVC

CMakeLists.txt

@@ -51,7 +51,7 @@ target_include_directories(hdf4cpp
         )
 
 target_link_libraries(hdf4cpp
-        ${HDF4_LIBRARIES}
+		hdf4::mfhdf-static
         )
 
 enable_testing()
@@ -64,7 +64,6 @@ add_executable(hdf4cpp-tests
 target_include_directories(hdf4cpp-tests
         PRIVATE
         ${GTEST_INCLUDE_DIRS}
-        ${hdf4cpp_INCLUDE_DIRS}
         )
 target_link_libraries(hdf4cpp-tests
         ${GTEST_BOTH_LIBRARIES}

include/hdf4cpp/HdfAttribute_priv.h

@@ -0,0 +1,97 @@
+/// \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.h>
+#include <mfhdf.h>
+#include <string>
+#include <vector>
+#include <map>
+#include <memory>
+
+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:
+    int32 _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:
+    int32 _size;
+    int32 dataType;
+    void get(void *dest);
+    int32 getDataType() const;
+};
+
+
+
+}
+
+#endif //HDF4CPP_HDFATTRIBUTE_PRIV_H

include/hdf4cpp/HdfObject.h

@@ -83,12 +83,12 @@ class HdfObject {
     }
 
     /// Throws an HdfException by its type
-    virtual void raiseException(const ExceptionType &exceptionType) const {
+	__declspec(noreturn) void raiseException(const ExceptionType &exceptionType) const {
         throw HdfException(type, classType, exceptionType);
     }
 
     /// Thorws an HdfException by its message, the type will be OTHER.
-    virtual void raiseException(const std::string &message) const {
+	__declspec(noreturn) void raiseException(const std::string &message) const {
         throw HdfException(type, classType, message);
     }
 

tests/HdfFileTest.cpp

@@ -39,7 +39,7 @@ TEST_F(HdfFileTest, ReadData2) {
     HdfItem item = file.get("DataWithAttributes");
     std::vector<float32> vec;
     item.read(vec);
-    ASSERT_EQ(vec, std::vector<float32>({0.0, 0.1, 0.2, 1.0, 1.1, 1.2, 2.0, 2.1, 2.2}));
+    ASSERT_EQ(vec, std::vector<float32>({0.0f, 0.1f, 0.2f, 1.0f, 1.1f, 1.2f, 2.0f, 2.1f, 2.2f}));
 }
 
 TEST_F(HdfFileTest, ReadDatasetAttributes) {
@@ -96,7 +96,7 @@ TEST_F(HdfFileTest, ReadDataInRange) {
         HdfItem item = file.get("DataWithAttributes");
         std::vector<float32> vec;
         item.read(vec, std::vector<Range>({Range(2, 1), Range(0, 2)}));
-        ASSERT_EQ(vec, std::vector<float32>({2.0, 2.1}));
+        ASSERT_EQ(vec, std::vector<float32>({2.0f, 2.1f}));
     }
 }