Use unique_ptr for HDF proxy factory

Change DataObjectRepository to accept ownership via std::unique_ptr for HDF proxy factories and deprecate the raw-pointer setter.
Update SWIG bindings to support std::unique_ptr when available (SWIG >= 4.1) while preserving compatibility paths for older SWIG versions and adjust C#/Java typemaps accordingly.
Also add MSVC compile flag /Zc:__cplusplus in src/CMakeLists.txt (see discussion https://gitlab.kitware.com/cmake/cmake/-/work_items/18837#note_722476).

Author: philippeVerney

CMakeLists.txt

@@ -37,7 +37,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
-
 # ============================================================================
 # checking for required dependencies
 # ============================================================================

example/example.cpp

@@ -2609,7 +2609,7 @@ bool serialize(const string& filePath)
 	epcDoc.serializeFrom(repo);
 
 	// Check HDF proxy factory
-	repo.setHdfProxyFactory(new HdfProxyFactoryExample());
+	repo.setHdfProxyFactory(std::make_unique<HdfProxyFactoryExample>());
 	auto* exoticHdfPox = repo.createHdfProxy("", "Dummy Exotic HDF proxy", "", "", COMMON_NS::DataObjectRepository::openingMode::READ_ONLY);
 	double dummyPoints[3] = { 1.0, 2.0, 3.0 };
 	repo.createPointSetRepresentation("", "")->pushBackXyzGeometryPatch(1, dummyPoints, exoticHdfPox);

example/exampleMPI.cpp

@@ -50,7 +50,7 @@ void serialize(const std::string filename) {
 	COMMON_NS::EpcDocument pck(filePath);
 	COMMON_NS::DataObjectRepository repo;
 
-	repo.setHdfProxyFactory(new COMMON_NS::HdfProxyMPIFactory());
+	repo.setHdfProxyFactory(std::make_unique<COMMON_NS::HdfProxyMPIFactory>());
 	EML2_NS::AbstractHdfProxy* hdfProxy = repo.createHdfProxy("", "Parallel Hdf Proxy", pck.getStorageDirectory(), pck.getName() + ".h5", COMMON_NS::DataObjectRepository::openingMode::OVERWRITE);
 	repo.setDefaultHdfProxy(hdfProxy);
 
@@ -91,7 +91,7 @@ void deserialize(const std::string filename) {
 	if (world_rank == 0) {
 		COMMON_NS::EpcDocument pck(filePath);
 		COMMON_NS::DataObjectRepository repo;
-		repo.setHdfProxyFactory(new COMMON_NS::HdfProxyMPIFactory());
+		repo.setHdfProxyFactory(std::make_unique<COMMON_NS::HdfProxyMPIFactory>());
 		const std::string resqmlResult = pck.deserializeInto(repo);
 		if (!resqmlResult.empty()) {
 			std::cerr << resqmlResult << std::endl;

src/CMakeLists.txt

@@ -42,10 +42,12 @@ set (EML_PREFIX_2_3 "eml2_3")
 # Define the compile options according to the compiler
 include(${FESAPI_ROOT_DIR}/cmake/cmake-harden.cmake)
 harden(${CPP_LIBRARY_NAME} CXX RUNTIME)
+# About /Zc:__cplusplus see https://gitlab.kitware.com/cmake/cmake/-/work_items/18837#note_722476
 target_compile_options(${CPP_LIBRARY_NAME} PRIVATE
 	$<$<CXX_COMPILER_ID:MSVC>:/bigobj>
 	$<$<CXX_COMPILER_ID:MSVC>:/MP>
 	$<$<CXX_COMPILER_ID:MSVC>:/W4>
+	$<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>
 )
 if (WITH_RESQML2_2)
 	target_compile_definitions(${CPP_LIBRARY_NAME} PUBLIC "-DWITH_RESQML2_2")

src/common/DataObjectRepository.cpp

@@ -3597,13 +3597,20 @@ void DataObjectRepository::registerDataFeeder(COMMON_NS::DataFeeder * dataFeeder
 	dataFeeders.push_back(dataFeeder);
 }
 
-void DataObjectRepository::setHdfProxyFactory(COMMON_NS::HdfProxyFactory * factory) {
+void DataObjectRepository::setHdfProxyFactory(COMMON_NS::HdfProxyFactory* factory) {
 	if (factory == nullptr) {
 		throw invalid_argument("You cannot set a NULL HDF proxy factory.");
 	}
 	hdfProxyFactory.reset(factory);
 }
 
+void DataObjectRepository::setHdfProxyFactory(std::unique_ptr<COMMON_NS::HdfProxyFactory> factory) {
+	if (factory == nullptr) {
+		throw invalid_argument("You cannot set a NULL HDF proxy factory.");
+	}
+	hdfProxyFactory = std::move(factory);
+}
+
 COMMON_NS::AbstractObject* DataObjectRepository::resolvePartial(COMMON_NS::AbstractObject * partialObj)
 {
 	for (auto const* dataFeeder : dataFeeders) {

src/common/DataObjectRepository.h

@@ -303,13 +303,21 @@ namespace COMMON_NS
 		 * @param[in]	target	The target object of the relationship.
 		 */
 		DLL_IMPORT_OR_EXPORT void deleteRelationship(COMMON_NS::AbstractObject * source, COMMON_NS::AbstractObject * target);
-
+		
 		/**
 		* Set the factory used to create HDF proxy and takes ownership of this HDF Proxy factory (don't delete it!)
 		* 
 		* @param[in]	factory	If non-null, the factory.
 		*/
-		DLL_IMPORT_OR_EXPORT void setHdfProxyFactory(COMMON_NS::HdfProxyFactory * factory);
+		[[deprecated("Use setHdfProxyFactory(std::unique_ptr<COMMON_NS::HdfProxyFactory> factory) instead.")]]
+		DLL_IMPORT_OR_EXPORT void setHdfProxyFactory(COMMON_NS::HdfProxyFactory* factory);
+
+		/**
+		* Set the factory used to create HDF proxy and takes ownership of this HDF Proxy factory (don't use it after having called this method!)
+		* 
+		* @param[in]	factory	If non-null, the factory.
+		*/
+		DLL_IMPORT_OR_EXPORT void setHdfProxyFactory(std::unique_ptr<COMMON_NS::HdfProxyFactory> factory);
 
 		/**
 		* Get the journal of the DataObject repository.

src/common/EpcDocument.cpp

@@ -315,7 +315,7 @@ string EpcDocument::deserializeInto(DataObjectRepository & repo, DataObjectRepos
 					if (rel.getType().compare("http://schemas.energistics.org/package/2012/relationships/externalResource") == 0) {
 						target = rel.getTarget();
 						if (target.find("http://") == 0 || target.find("https://") == 0) {
-							repo.setHdfProxyFactory(new HdfProxyROS3Factory());
+							repo.setHdfProxyFactory(std::make_unique<HdfProxyROS3Factory>());
 						}
 						wrapper = repo.addOrReplaceGsoapProxy(package->extractFile(contentTypeEntry.second.getExtensionOrPartName().substr(1)), contentType, filePath);
 						break;
@@ -411,10 +411,10 @@ std::string EpcDocument::deserializePartiallyInto(DataObjectRepository & repo, D
 						if (allRels[relIndex].getType().compare("http://schemas.energistics.org/package/2012/relationships/externalResource") == 0) {
 							const std::string target = allRels[relIndex].getTarget();
 							if (target.find("http://") == 0 || target.find("https://") == 0) {
-								repo.setHdfProxyFactory(new HdfProxyROS3Factory());
+								repo.setHdfProxyFactory(std::make_unique<HdfProxyROS3Factory>());
 							}
 							else {
-								repo.setHdfProxyFactory(new HdfProxyFactory());
+								repo.setHdfProxyFactory(std::make_unique<HdfProxyFactory>());
 							}
 							wrapper = repo.addOrReplaceGsoapProxy(package->extractFile(it.second.getExtensionOrPartName().substr(1)), contentType, filePath);
 							static_cast<EML2_0_NS::HdfProxy*>(wrapper)->setRelativePath(target);

swig/swigModule.i

@@ -19,16 +19,11 @@ under the License.
 %module fesapi
 %feature("python:annotations", "c");
 
-%{
-#if defined(__clang__) || defined(_MSC_VER)
-#elif defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-%}
-
 %include "stdint.i"
 %include "std_string.i"
+#if SWIG_VERSION >= 0x040100
+%include <std_unique_ptr.i>
+#endif
 
 %include "../src/nsDefinitions.h"
 
@@ -94,13 +89,15 @@ under the License.
 	SWIG_CSBODY_PROXY(public, public, SWIGTYPE)
 	SWIG_CSBODY_TYPEWRAPPER(public, public, public, SWIGTYPE)
 
+#if SWIG_VERSION < 0x040100
 %typemap(cscode) COMMON_NS::DataObjectRepository %{
   private HdfProxyFactory hdfProxyFactoryReference = null;
 %}
 
 %typemap(csin,
          post="      hdfProxyFactoryReference = $csinput;"
          ) COMMON_NS::HdfProxyFactory * factory "HdfProxyFactory.getCPtr($csinput)"
+#endif
 
 	%include "swigCsInclude.i"
 #endif
@@ -116,6 +113,7 @@ under the License.
 	%}
 	%include "swigPythonInclude.i"
 
+#if SWIG_VERSION < 0x040100
 	/* Following extensions aims at preventing the Python garbage collector from
 	garbage collecting an HDF Proxy factory that may be still used by a repository. */
 	%fragment("hdf_proxy_factory_reference_init", "init") {
@@ -133,6 +131,7 @@ under the License.
 		%}
 	}
 #endif
+#endif
 
 
 //************************/
@@ -220,6 +219,7 @@ namespace EML2_NS
 %module(directors="1") fesapi
 %feature("director") COMMON_NS::HdfProxyFactory;
 
+#if SWIG_VERSION < 0x040100
 /*
 Following csbody and javabody typemap definitions force the target language to not 
 manage the memory of the C++ part of wrapped COMMON_NS::HdfProxyFactory and 
@@ -254,6 +254,7 @@ destructor).
     return (obj == null) ? 0 : obj.swigCPtr;
   }
 %}
+#endif
 
 /* 
 AbstractHdfProxy may be inherited in target languages. In such case, overriding
@@ -276,6 +277,10 @@ warning (205) during the Swig processing.
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 %}
+
+#if SWIG_VERSION >= 0x040100
+%unique_ptr(COMMON_NS::HdfProxyFactory)
+#endif
 namespace COMMON_NS
 {
 	%nodefaultctor; // Disable creation of default constructors
@@ -917,19 +922,22 @@ import java.lang.AutoCloseable;
 import com.f2i_consulting.fesapi.*;
 %}
 %typemap(javainterfaces) COMMON_NS::DataObjectRepository "AutoCloseable"
-%typemap(javacode) COMMON_NS::DataObjectRepository %{
-  private HdfProxyFactory hdfProxyFactoryReference;
-  
+%typemap(javacode) COMMON_NS::DataObjectRepository %{  
   @Override
   public void close() {
 	clear();
     delete();
   }
 %}
+
+#if SWIG_VERSION < 0x040100
+%typemap(javacode) COMMON_NS::DataObjectRepository %{
+  private HdfProxyFactory hdfProxyFactoryReference;
+%}
 %typemap(javain, 
          post="      hdfProxyFactoryReference = $javainput;"
          ) COMMON_NS::HdfProxyFactory * factory "HdfProxyFactory.getCPtr($javainput)"
-		 
+#endif
 	/**
 	 * @brief	A DataObjectRepository stores in memory all dataObjects.
 	 *			This is the in-memory container which holds deserialized (EPC) files and fetched ETP dataobjects.
@@ -1039,13 +1047,23 @@ import com.f2i_consulting.fesapi.*;
 		 * @param[in]	hdfProxy	If non-null, the HDF5 file proxy.
 		 */
 		void setDefaultHdfProxy(EML2_NS::AbstractHdfProxy* hdfProxy);
-
+		
+#if SWIG_VERSION >= 0x040100
+		/**
+		* Set the factory used to create HDF proxy and takes ownership of this HDF Proxy factory (don't use it after having called this method!)
+		* 
+		* @param[in]	factory	If non-null, the factory.
+		*/
+		void setHdfProxyFactory(std::unique_ptr<COMMON_NS::HdfProxyFactory> factory);
+#else
 		/**
-		* Set the factory used to create HDF proxy and takes ownership of this HDF Proxy factory (don't delete it!)
+		* Set the factory used to create HDF proxy and takes ownership of this HDF Proxy factory.
+		* Don't delete it! Do not allow gabage to collect it. Disown it from Swig since it will be destroyed by the C++ layer anyhow.
 		* 
 		* @param[in]	factory	If non-null, the factory.
 		*/
-		void setHdfProxyFactory(COMMON_NS::HdfProxyFactory * factory);
+		void setHdfProxyFactory(COMMON_NS::HdfProxyFactory* factory);
+#endif
 
 		/**
 		 * Adds or replaces (based on Energistics XML definition) a data object in the repository. It