fix compilation of language bindings with swig4 for java and C#

copasi · Nov 7, 2024 · 6b29ea5 · 6b29ea5
1 parent 7185afa
commit 6b29ea5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/copasi/bindings/csharp/local.cpp b/copasi/bindings/csharp/local.cpp
@@ -39,6 +39,9 @@
 #include <copasi/model/CModelParameter.h>
 #include <copasi/model/CModelParameterSet.h>
 
+#include <copasi/CopasiTypes.h>
+
+
 // Now we specify the definitions
 // for the type determination methods
 

diff --git a/copasi/bindings/swig/CCopasiTask.i b/copasi/bindings/swig/CCopasiTask.i
@@ -70,8 +70,10 @@
 %warnfilter(325) CDescription;
 %warnfilter(325) CResult;
 
+#if (!defined SWIGJAVA)
 %template(TaskSubTypeVector) std::vector<CTaskEnum::Task>;
 %template(MethodSubTypeVector) std::vector<CTaskEnum::Method>;
+#endif
 
 %include "copasi/utilities/CTaskEnum.h"
 %include "copasi/utilities/CCopasiTask.h"

diff --git a/copasi/bindings/swig/CDataObject.i b/copasi/bindings/swig/CDataObject.i
@@ -116,7 +116,9 @@ namespace std {
 
 #if !defined(SWIGR) && !defined(SWIGPERL) && !defined(SWIGOCTAVE)
 %template(DataObjectSet) set< const CDataObject * >;
+#if (!defined SWIGJAVA)
 %template(DataObjectMap) map< const CDataObject *, const CDataObject * >;
+#endif
 %template(DataObjectVector) vector< const CDataObject * >;
 %template(VectorOfDataObjectVector) vector< vector< const CDataObject * > >;
 #endif // !defined(SWIGR) && !defined(SWIGPERL) && !defined(SWIGOCTAVE)

diff --git a/copasi/bindings/swig/CDataVector.i b/copasi/bindings/swig/CDataVector.i
@@ -361,7 +361,9 @@
 %template(ReferenceVector) CDataVector<CReference>;
 %template(ModificationVector) CDataVector<CModification>;
 
+#if (!defined SWIGJAVA)
 %template(ObjectListTypeStdVector) std::vector<CObjectLists::ListType>;
+#endif
 
 typedef CDataVectorN<CEvent> EventVectorN;
 

diff --git a/copasi/bindings/swig/CModel.i b/copasi/bindings/swig/CModel.i
@@ -49,10 +49,12 @@
 
 %template(ObjectStdVector) std::vector<CDataObject*>;
 typedef std::vector<CDataObject*> ObjectStdVector;
+#if (!defined SWIGJAVA)
 %template(StringUnitMap) std::map< std::string, CUnit >;
 typedef std::map< std::string, CUnit > StringUnitMap;
 %template(StringDoubleMap) std::map< std::string, double >;
 typedef std::map< std::string, double > StringDoubleMap;
+#endif
 
 %ignore CUnit::getSymbolComponents;
 %ignore CUnit::SymbolComponent;

diff --git a/copasi/bindings/swig/copasi.i b/copasi/bindings/swig/copasi.i
@@ -78,6 +78,7 @@ LIBCOMBINE_CPP_NAMESPACE_USE
 #include "local.cpp"
 
 #include <copasi/core/CCore.h>
+#include <copasi/CopasiTypes.h>
 
 /**
  * This method is used to get the C_INVALID_INDEX