Version 7.10.3. Bug fix in MaliPPWriter2 destructor in debug mode.

LIHPC-Computational-Geometry · Aug 30, 2024 · 085d4ce · 085d4ce
1 parent 299ecfb
commit 085d4ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -4,7 +4,7 @@
 
 set (LIMA_MAJOR_VERSION "7")
 set (LIMA_MINOR_VERSION "10")
-set (LIMA_RELEASE_VERSION "2")
+set (LIMA_RELEASE_VERSION "3")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 
diff --git a/installation.txt b/installation.txt
@@ -20,7 +20,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=OFF -DSUMESH:BOOL=OFF -DFORMAT_MLI:BOOL=OFF -DFORMAT_MLI2:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0  \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.10.2
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.10.3
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -30,7 +30,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=ON -DSUMESH:BOOL=ON -DFORMAT_MLI:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.10.2
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.10.3
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 

diff --git a/src/Lima/malipp2.cpp b/src/Lima/malipp2.cpp
@@ -3679,7 +3679,6 @@ MaliPPWriter2& MaliPPWriter2::operator = (const MaliPPWriter2&)
 
 MaliPPWriter2::~MaliPPWriter2 ( )
 {
-	assert (0 && "MaliPPWriter2::~MaliPPWriter2 is not allowed.");
 }	// MaliPPWriter2::~MaliPPWriter2
 
 
@@ -3694,22 +3693,18 @@ HDFAttributeDescriptor2Type::HDFAttributeDescriptor2Type ( )
 	StrType		type (PredType::C_S1);
 	type.setSize (MLI2_ATTRIBUT_SIZE);
 	insertMember (m_name, HOFFSET (HDFAttributeDescriptor2, m_name), type);
-	insertMember (m_type, HOFFSET (HDFAttributeDescriptor2, m_type), 
-	               PredType::NATIVE_INT16);
-	insertMember (m_size, HOFFSET (HDFAttributeDescriptor2, m_size), 
-	               PredType::NATIVE_UINT32);
+	insertMember (m_type, HOFFSET (HDFAttributeDescriptor2, m_type), PredType::NATIVE_INT16);
+	insertMember (m_size, HOFFSET (HDFAttributeDescriptor2, m_size), PredType::NATIVE_UINT32);
 }	// HDFAttributeDescriptor2Type::HDFAttributeDescriptor2Type
 
 
-HDFAttributeDescriptor2Type::HDFAttributeDescriptor2Type (
-									const HDFAttributeDescriptor2Type& at)
+HDFAttributeDescriptor2Type::HDFAttributeDescriptor2Type (const HDFAttributeDescriptor2Type& at)
 	: CompType (at)
 {
 }	// HDFAttributeDescriptor2Type copy constructor
 
 
-HDFAttributeDescriptor2Type& HDFAttributeDescriptor2Type::operator = (
-									const HDFAttributeDescriptor2Type&)
+HDFAttributeDescriptor2Type& HDFAttributeDescriptor2Type::operator = (const HDFAttributeDescriptor2Type&)
 {
 	return *this;
 }	// HDFAttributeDescriptor2Type::operator =