Remaining files to fix MacOS X compilation.

copasi · Mar 20, 2024 · 0f7ec1a · 0f7ec1a
1 parent 6cf78c4
commit 0f7ec1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/copasi/core/CDataContainer.h b/copasi/core/CDataContainer.h
@@ -55,6 +55,26 @@ class CDataContainer: public CDataObject
   CDataContainer(const CDataContainer & src);
 
 public:
+  template < class CType > static bool findObjectAncestor(const CDataObject * pObject, CType *& pAncestor)
+  {
+    pAncestor = nullptr;
+
+    CDataObject * p = const_cast< CDataObject * >(pObject);
+
+    while (p != nullptr)
+      {
+        if (dynamic_cast< CType * >(p) != nullptr)
+          {
+            pAncestor = static_cast< CType * >(p);
+            return true;
+          }
+
+        p = p->getObjectParent();
+      }
+
+    return false;
+  }
+
   /**
    * Static method to create a CDataObject based on the provided data
    * @param const CData & data

diff --git a/copasi/core/CDataObject.h b/copasi/core/CDataObject.h
@@ -245,26 +245,6 @@ class CDataObject: public CObjectInterface, public CUndoObjectInterface
 
   CDataContainer * getObjectAncestor(const std::string & type) const;
 
-  template < class CType > static bool findObjectAncestor(const CDataObject * pObject, CType *& pAncestor)
-  {
-    pAncestor = nullptr;
-
-    CDataObject * p = const_cast< CDataObject * >(pObject);
-
-    while (p != nullptr)
-      {
-        if (dynamic_cast< CType * >(p) != nullptr)
-          {
-            pAncestor = static_cast< CType * >(p);
-            return true;
-          }
-
-        p = p->getObjectParent();
-      }
-
-    return false;
-  }
-
   bool prerequisitsContains(const DataObjectSet & objects) const;
 
   /**