[sbml-svn] SF.net SVN: sbml:[21124] branches/libsbml-experimental

[<sar...@us...>]

Revision: 21124
          http://sourceforge.net/p/sbml/code/21124
Author:   sarahkeating
Date:     2014-09-11 07:35:54 +0000 (Thu, 11 Sep 2014)
Log Message:
-----------
Merged revision(s) 21120-21123 from trunk/libsbml:

Modified Paths:
--------------
    branches/libsbml-experimental/CMakeLists.txt
    branches/libsbml-experimental/src/bindings/swig/ASTNodes.i
    branches/libsbml-experimental/src/sbml/util/IdList.h

Property Changed:
----------------
    branches/libsbml-experimental/

Index: branches/libsbml-experimental
===================================================================
--- branches/libsbml-experimental	2014-09-10 09:25:20 UTC (rev 21123)
+++ branches/libsbml-experimental	2014-09-11 07:35:54 UTC (rev 21124)

Property changes on: branches/libsbml-experimental
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/libsbml-4:9056-10118
 /branches/libsbml-5-conversion:14155-14227
 /branches/libsbml-ast-plugin:16251-19654
-/trunk/libsbml:18168-18171,18174-18194,18196-18201,18204,18207-18209,18211-18213,18215-18216,18226,18228-18292,18294-18388,18390-18443,18450-18454,18456-18458,18460-18462,18464,18466,18469-18520,18523-18561,18563,18565-18584,18586-18638,18640-18641,18644-18715,18717-18844,18846-19128,19130-19829,19831-21119
+/trunk/libsbml:18168-18171,18174-18194,18196-18201,18204,18207-18209,18211-18213,18215-18216,18226,18228-18292,18294-18388,18390-18443,18450-18454,18456-18458,18460-18462,18464,18466,18469-18520,18523-18561,18563,18565-18584,18586-18638,18640-18641,18644-18715,18717-18844,18846-19128,19130-19829,19831-21123
\ No newline at end of property
Modified: branches/libsbml-experimental/CMakeLists.txt
===================================================================
--- branches/libsbml-experimental/CMakeLists.txt	2014-09-10 09:25:20 UTC (rev 21123)
+++ branches/libsbml-experimental/CMakeLists.txt	2014-09-11 07:35:54 UTC (rev 21124)
@@ -312,7 +312,8 @@
 "You are using SWIG version ${SWIG_VERSION}.  We strongly recommend
 using at least version 2.0.4, for Javascript support you will need SWIG > 3.0.1.")
     endif()
-    set(SWIG_EXTRA_ARGS)
+    set(SWIG_EXTRA_ARGS -DLIBSBML_COMPILED_IN_SRC)
+    add_definitions(-DLIBSBML_COMPILED_IN_SRC)
     set(SWIG_SWIGDOCDEFINES)
 endif(WITH_SWIG)
 

Modified: branches/libsbml-experimental/src/bindings/swig/ASTNodes.i
===================================================================
--- branches/libsbml-experimental/src/bindings/swig/ASTNodes.i	2014-09-10 09:25:20 UTC (rev 21123)
+++ branches/libsbml-experimental/src/bindings/swig/ASTNodes.i	2014-09-11 07:35:54 UTC (rev 21124)
@@ -41,6 +41,8 @@
 
 #else
 
+#ifdef LIBSBML_COMPILED_IN_SRC
+
 #include <sbml/math-legacy/ASTNode.h>
 #include <sbml/math-legacy/MathML.h>
 #include <sbml/math-legacy/L3FormulaFormatter.h>
@@ -49,9 +51,21 @@
 #include <sbml/math-legacy/L3Parser.h>
 #include <sbml/math-legacy/L3ParserSettings.h>
 
+#else 
+
+#include <sbml/math/ASTNode.h>
+#include <sbml/math/MathML.h>
+#include <sbml/math/L3FormulaFormatter.h>
+#include <sbml/math/FormulaFormatter.h>
+#include <sbml/math/FormulaParser.h>
+#include <sbml/math/L3Parser.h>
+#include <sbml/math/L3ParserSettings.h>
+
 #endif
 
+#endif
 
+
 %}
 
 
@@ -80,6 +94,8 @@
   
 #else
 
+#ifdef LIBSBML_COMPILED_IN_SRC
+  
   %include sbml/math-legacy/ASTNode.h
   %include sbml/math-legacy/MathML.h
   %include sbml/math-legacy/FormulaParser.h
@@ -87,5 +103,17 @@
   %include sbml/math-legacy/FormulaFormatter.h
   %include sbml/math-legacy/L3Parser.h
   %include sbml/math-legacy/L3ParserSettings.h
+
+#else
+
+  %include sbml/math/ASTNode.h
+  %include sbml/math/MathML.h
+  %include sbml/math/FormulaParser.h
+  %include sbml/math/L3FormulaFormatter.h
+  %include sbml/math/FormulaFormatter.h
+  %include sbml/math/L3Parser.h
+  %include sbml/math/L3ParserSettings.h
+
+#endif
   
 #endif

Modified: branches/libsbml-experimental/src/sbml/util/IdList.h
===================================================================
--- branches/libsbml-experimental/src/sbml/util/IdList.h	2014-09-10 09:25:20 UTC (rev 21123)
+++ branches/libsbml-experimental/src/sbml/util/IdList.h	2014-09-11 07:35:54 UTC (rev 21124)
@@ -91,7 +91,7 @@
    *
    * @return an iterator to the beginning of this IdList.
    */
-  std::vector<std::string>::const_iterator& begin () const
+  std::vector<std::string>::const_iterator begin () const
   {
     return mIds.begin();
   }
@@ -101,7 +101,7 @@
    *
    * @return an iterator to the end of this IdList.
    */
-  std::vector<std::string>::const_iterator& end () const
+  std::vector<std::string>::const_iterator end () const
   {
     return mIds.end();
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.