[Ecell-cvs] SF.net SVN: ecell:[3841] ecell3/trunk/ecell

[<mor...@us...>]

Revision: 3841
          http://ecell.svn.sourceforge.net/ecell/?rev=3841&view=rev
Author:   moriyoshi
Date:     2010-06-26 01:27:30 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
* Fix a few more build issues.

Modified Paths:
--------------
    ecell3/trunk/ecell/dm/ODEStepper.cpp
    ecell3/trunk/ecell/libecs/PropertySlot.hpp
    ecell3/trunk/ecell/libecs/Variable.hpp

Modified: ecell3/trunk/ecell/dm/ODEStepper.cpp
===================================================================
--- ecell3/trunk/ecell/dm/ODEStepper.cpp	2010-06-17 06:54:24 UTC (rev 3840)
+++ ecell3/trunk/ecell/dm/ODEStepper.cpp	2010-06-26 01:27:30 UTC (rev 3841)
@@ -139,17 +139,17 @@
     Real estimateLocalError( Real const aStepInterval );
 
     void initializeRadauIIA( VariableVector::size_type );
-    std::pair< bool, Real > calculateRadauIIA( Real const aStepInterval, Real const aPreviousStepInterval );
-    void updateInternalStateRadauIIA( Real const aStepInterval );
+    std::pair< bool, Real > calculateRadauIIA( Real aStepInterval, Real aPreviousStepInterval );
+    void updateInternalStateRadauIIA( Real aStepInterval );
 
-    void initializeTolerance( Real value )
+    void initializeTolerance( libecs::Param<Real>::type value )
     {
         setTolerance( value ); // AdaptiveDifferentialStepper::
         rtoler = 0.1 * pow( getTolerance(), 2.0 / 3.0 );
         atoler = rtoler * getAbsoluteToleranceFactor();
     }
 
-    void initializeAbsoluteToleranceFactor( Real value )
+    void initializeAbsoluteToleranceFactor( libecs::Param<Real>::type value )
     {
         setAbsoluteToleranceFactor( value ); // AdaptiveDifferentialStepper::
         atoler = rtoler * getAbsoluteToleranceFactor();
@@ -619,7 +619,7 @@
     return sqrt( aNorm / ( 3 * theSystemSize ) );
 }
 
-std::pair< bool, Real > ODEStepper::calculateRadauIIA( Real const aStepInterval, Real const aPreviousStepInterval )
+std::pair< bool, Real > ODEStepper::calculateRadauIIA( Real aStepInterval, Real aPreviousStepInterval )
 {
     Real aNewStepInterval;
     Real aNorm( 0. );

Modified: ecell3/trunk/ecell/libecs/PropertySlot.hpp
===================================================================
--- ecell3/trunk/ecell/libecs/PropertySlot.hpp	2010-06-17 06:54:24 UTC (rev 3840)
+++ ecell3/trunk/ecell/libecs/PropertySlot.hpp	2010-06-26 01:27:30 UTC (rev 3841)
@@ -179,8 +179,8 @@
     typedef SlotType ( T::* GetMethodPtr )() const;
 
     ConcretePropertySlot( String const& aName,
-                          const SetMethodPtr aSetMethodPtr,
-                          const GetMethodPtr aGetMethodPtr )
+                          SetMethodPtr aSetMethodPtr,
+                          GetMethodPtr aGetMethodPtr )
         : theName( aName ),
           theType( PropertySlotBase::TypeToTypeCode< SlotType_ >::value ),
           theSetMethodPtr( SetMethod( aSetMethodPtr ) ),

Modified: ecell3/trunk/ecell/libecs/Variable.hpp
===================================================================
--- ecell3/trunk/ecell/libecs/Variable.hpp	2010-06-17 06:54:24 UTC (rev 3840)
+++ ecell3/trunk/ecell/libecs/Variable.hpp	2010-06-26 01:27:30 UTC (rev 3841)
@@ -176,7 +176,7 @@
     }
 
 
-    void loadValue( Real aValue )
+    void loadValue( Param<Real>::type aValue )
     {
         theValue = aValue;
     }


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