No commit message

nabel · Oct 7, 2011 · c2b62b2 · c2b62b2
1 parent 699a743
commit c2b62b2
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 128 deletions.
diff --git a/copasi/CMakeLists.txt b/copasi/CMakeLists.txt
@@ -48,6 +48,7 @@ ADD_DEFINITIONS(-DUSE_CLAPACK)
 #ADD_DEFINITIONS(-DCOPASI_DEBUG)
 #ADD_DEFINITIONS(-DDEBUG_MATRIX)
 ADD_DEFINITIONS(-DTC_EXPORTS)
+ADD_DEFINITIONS(-DLIBSBML_EXPORTS)
 
 #------------------------------------------
 #  DEFINITIONS FOR WINDOWS

diff --git a/copasi/compareExpressions/CNormalLogical.cpp b/copasi/compareExpressions/CNormalLogical.cpp
@@ -905,7 +905,7 @@ bool CNormalLogical::generateCanonicalDNF(ItemSetOfSets& tmpAndSets) const
             {
               // create a new row for the truth table
               // the bits in i can be mapped to the truth values
-              std::bitset<16> bitSet(i);
+              std::bitset<16> bitSet((int)i);
               unsigned int j, jMax = itemVector.size();
 
               for (j = 0; j < jMax; ++j)

diff --git a/copasi/copasi.h b/copasi/copasi.h
@@ -238,5 +238,5 @@ extern std::ofstream DebugFile;
 // suppress unused parameter warnings
 #define C_UNUSED(p)
 #define COPASI_DEPRECATED
-#define C_INVALID_INDEX (std::numeric_limits< unsigned C_INT32 >::max())
+extern unsigned C_INT32 C_INVALID_INDEX;
 #endif // COPASI_copasi
diff --git a/copasi/copasi_api.cpp b/copasi/copasi_api.cpp
@@ -81,6 +81,8 @@ using namespace LIB_STRUCTURAL;
 using namespace LIB_LA;
 using namespace std;
 
+unsigned C_INT32 C_INVALID_INDEX = std::numeric_limits< unsigned C_INT32 >::max();
+
 struct CopasiPtr 
 { 
 	string name;

diff --git a/copasi/function/CFunction.cpp b/copasi/function/CFunction.cpp
@@ -371,9 +371,9 @@ std::pair<CFunction *, CFunction *> CFunction::splitFunction(const CEvaluationNo
     const std::string & name1,
     const std::string & name2) const
 {
-  if (!this->mpRoot) return std::pair<CFunction *, CFunction *>(NULL, NULL);
+  if (!this->mpRoot) return std::pair<CFunction *, CFunction *>((CFunction *)NULL, (CFunction *)NULL);
 
-  if (this->mReversible != TriTrue) return std::pair<CFunction *, CFunction *>(NULL, NULL);
+  if (this->mReversible != TriTrue) return std::pair<CFunction *, CFunction *>((CFunction *)NULL, (CFunction *)NULL);
 
   //create 2 new functions
   CFunction* newFunction1 = new CFunction();
@@ -390,7 +390,7 @@ std::pair<CFunction *, CFunction *> CFunction::splitFunction(const CEvaluationNo
   // find the split point
   const CEvaluationNode* splitnode = this->mpRoot->findTopMinus(callParameters);
 
-  if (!splitnode) return std::pair<CFunction *, CFunction *>(NULL, NULL);
+  if (!splitnode) return std::pair<CFunction *, CFunction *>((CFunction *)NULL, (CFunction *)NULL);
 
   //create the 2 split trees
   CEvaluationNode* tmpRoots1 = this->mpRoot->splitBranch(splitnode, true); //left side

diff --git a/copasi/model/CProcessQueue.cpp b/copasi/model/CProcessQueue.cpp
@@ -289,7 +289,7 @@ bool CProcessQueue::process(const C_FLOAT64 & time,
   // as the queue enforces the proper ordering.
   while (success &&
          notEmpty(Assignments) &&
-         mCascadingLevel != std::numeric_limits<unsigned C_INT32>::max())
+		 mCascadingLevel != std::numeric_limits<unsigned C_INT32>::max())
     {
       // We switch to the next cascading level so that events triggered by the
       // execution of assignments are properly scheduled.

diff --git a/copasi/sbml/CSBMLExporter.cpp b/copasi/sbml/CSBMLExporter.cpp
@@ -6475,7 +6475,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase *)NULL));
         }
     }
 
@@ -6490,7 +6490,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase*)NULL));
         }
     }
 
@@ -6503,7 +6503,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase*)NULL));
         }
     }
 
@@ -6516,7 +6516,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase*)NULL));
         }
     }
 
@@ -6529,7 +6529,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase*)NULL));
         }
     }
 
@@ -6542,7 +6542,7 @@ void CSBMLExporter::collectIds(const CCopasiDataModel& dataModel, std::map<std::
 
       if (!id.empty())
         {
-          idMap.insert(std::pair<const std::string, const SBase*>(id, NULL));
+          idMap.insert(std::pair<const std::string, const SBase*>(id, (const SBase*)NULL));
         }
     }
 }
@@ -6558,7 +6558,7 @@ void CSBMLExporter::assignSBMLIdsToReactions(CModel* pModel)
         {
           sbmlId = CSBMLExporter::createUniqueId(this->mIdMap, "reaction_");
           (*it)->setSBMLId(sbmlId);
-          this->mIdMap.insert(std::pair<const std::string, const SBase*>(sbmlId, NULL));
+          this->mIdMap.insert(std::pair<const std::string, const SBase*>(sbmlId, (const SBase*)NULL));
         }
 
       ++it;

diff --git a/copasi/trajectory/CHybridMethod.cpp b/copasi/trajectory/CHybridMethod.cpp
@@ -43,6 +43,7 @@
 #endif // WIN32
 
 #include <limits.h>
+#include <iterator>
 
 #include "mathematics.h" // pow(), floor()