Merge branch 'master' of ssh://git.mpi-cbg.de/openfpm/openfpm_io into master

CMakeLists.txt

@@ -14,7 +14,6 @@ endif()
 set(BOOST_INCLUDE ${Boost_INCLUDE_DIR} CACHE PATH "Include directory for BOOST")
 set(HDF5_ROOT CACHE PATH "HDF5 root path")
 set(SE_CLASS1 CACHE BOOL "Activate compilation with SE_CLASS1")
-set(SE_CLASS2 CACHE BOOL "Activate compilation with SE_CLASS2")
 set(SE_CLASS3 CACHE BOOL "Activate compilation with SE_CLASS3")
 set(ENV{HDF5_ROOT} ${HDF5_ROOT})
 set(OPENFPM_PDATA_DIR CACHE PATH "OpenFPM_pdata dirs")
@@ -68,10 +67,6 @@ if(SE_CLASS1)
 	set(DEFINE_SE_CLASS1 "#define SE_CLASS1")
 endif()
 
-if(SE_CLASS2)
-	set(DEFINE_SE_CLASS2 "#define SE_CLASS2")
-endif()
-
 if(SE_CLASS3)
 	set(DEFINE_SE_CLASS3 "#define SE_CLASS3")
 endif()

configure

@@ -104,7 +104,6 @@ enable_test_performance
 enable_test_coverage
 with_parmetis
 enable_se_class1
-enable_se_class2
 enable_se_class3
 with_action_on_error
 with_boost
@@ -220,9 +219,6 @@ do
     se_class1)
        conf_options="$conf_options -DSE_CLASS1=ON"
        ;;
-    se_class2)
-       conf_options="$conf_options -DSE_CLASS2=ON"
-       ;;
     se_class3)
        conf_options="$conf_options -DSE_CLASS3=ON"
        ;;

src/CMakeLists.txt

@@ -9,7 +9,6 @@ add_executable(io main.cpp
 				  ../../openfpm_vcluster/src/VCluster/VCluster.cpp 
 				  ../../openfpm_devices/src/memory/CudaMemory.cu 
 				  ../../openfpm_devices/src/memory/HeapMemory.cpp 
-				  ../../openfpm_devices/src/Memleak_check.cpp 
 				  ../../openfpm_devices/src/memory/PtrMemory.cpp)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

src/HDF5_wr/HDF5_writer_gd.hpp

@@ -173,6 +173,9 @@ public:
 	    H5Sclose(file_dataspace_id_2);
 	    H5Pclose(plist_id);
 	    H5Fclose(file);
+
+	    mem.decRef();
+	    delete &mem;
 	}
 
 };

src/HDF5_wr/HDF5_writer_vd.hpp

@@ -156,6 +156,8 @@ public:
 		H5Sclose(mem_dataspace_id);
 		H5Pclose(plist_id);
 		H5Fclose(file);
+		mem.decRef();
+		delete &mem;
 	}
 
 	/*! \brief Return the equivalent HDF5 type for T

src/config/config_cmake.h.in

@@ -140,9 +140,6 @@ ${DEFINE_PERFORMANCE_TEST}
 /* Security enhancement class 1 */
 ${DEFINE_SE_CLASS1}
 
-/* Security enhancement class 2 */
-${DEFINE_SE_CLASS2}
-
 /* Security enhancement class 3 */
 ${DEFINE_SE_CLASS3}