Merged changes from branch Build-12 into the main developmetn resources.

copasi · Feb 1, 2005 · 2e10b13 · 2e10b13
1 parent 2ce0c63
commit 2e10b13
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/copasi/trajectory/CTrajectoryMethod.cpp b/copasi/trajectory/CTrajectoryMethod.cpp
@@ -1,9 +1,9 @@
 /* Begin CVS Header
    $Source: /Volumes/Home/Users/shoops/cvs/copasi_dev/copasi/trajectory/CTrajectoryMethod.cpp,v $
-   $Revision: 1.23 $
+   $Revision: 1.24 $
    $Name:  $
-   $Author: jpahle $ 
-   $Date: 2005/01/11 10:14:30 $
+   $Author: shoops $ 
+   $Date: 2005/02/01 14:58:56 $
    End CVS Header */
 
 /**
@@ -23,14 +23,14 @@
 #include "model/CCompartment.h"
 
 CTrajectoryValidSubTypes::CTrajectoryValidSubTypes():
-    CVector< CCopasiMethod::SubType >(4)
+    std::vector< CCopasiMethod::SubType >()
 {
-  CCopasiMethod::SubType * pSubType = array();
-
-  *pSubType++ = CCopasiMethod::deterministic;
-  *pSubType++ = CCopasiMethod::stochastic;
-  *pSubType++ = CCopasiMethod::hybrid;
-  *pSubType++ = CCopasiMethod::tauLeap;
+  push_back(CCopasiMethod::deterministic);
+  push_back(CCopasiMethod::stochastic);
+#ifdef COPASI_DEBUG
+  push_back(CCopasiMethod::hybrid);
+  push_back(CCopasiMethod::tauLeap);
+#endif // COPASI_DEBUG
 }
 
 /**

diff --git a/copasi/trajectory/CTrajectoryMethod.h b/copasi/trajectory/CTrajectoryMethod.h
@@ -1,9 +1,9 @@
 /* Begin CVS Header
    $Source: /Volumes/Home/Users/shoops/cvs/copasi_dev/copasi/trajectory/CTrajectoryMethod.h,v $
-   $Revision: 1.18 $
+   $Revision: 1.19 $
    $Name:  $
-   $Author: jpahle $ 
-   $Date: 2005/01/11 10:14:30 $
+   $Author: shoops $ 
+   $Date: 2005/02/01 14:58:56 $
    End CVS Header */
 
 /**
@@ -26,7 +26,7 @@
 class CTrajectoryProblem;
 class CState;
 
-class CTrajectoryValidSubTypes : public CVector< CCopasiMethod::SubType >
+class CTrajectoryValidSubTypes : public std::vector< CCopasiMethod::SubType >
   {
   public:
     /**