[Ecell-cvs] SF.net SVN: ecell:[3857] ecell3/trunk/ecell/libecs/System.hpp

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

Revision: 3857
          http://ecell.svn.sourceforge.net/ecell/?rev=3857&view=rev
Author:   moriyoshi
Date:     2010-09-08 13:39:18 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
* Remove usage of DECLARE_MAP()
* Add missing typenames to dependent names.

Modified Paths:
--------------
    ecell3/trunk/ecell/libecs/System.hpp

Modified: ecell3/trunk/ecell/libecs/System.hpp
===================================================================
--- ecell3/trunk/ecell/libecs/System.hpp	2010-09-08 13:38:16 UTC (rev 3856)
+++ ecell3/trunk/ecell/libecs/System.hpp	2010-09-08 13:39:18 UTC (rev 3857)
@@ -48,9 +48,9 @@
 {
 public:
     // Maps used for entry lists
-    typedef std::map<String, Variable*, std::less<String> > VariableMap;
-    typedef std::map<String, Process*, std::less<String> > ProcessMap;
-    typedef std::map<String, System*, std::less<String> > SystemMap;
+    typedef std::map< String, Variable*, std::less< String > > VariableMap;
+    typedef std::map< String, Process*, std::less< String > > ProcessMap;
+    typedef std::map< String, System*, std::less< String > > SystemMap;
 
     typedef boost::iterator_range< VariableMap::iterator > Variables;
     typedef boost::iterator_range< ProcessMap::iterator > Processes;
@@ -121,7 +121,7 @@
     }
 
     template <class T_>
-    boost::iterator_range< typename std::map< const String, T_*, std::less<const String> >::iterator > getEntities() const;
+    boost::iterator_range< typename std::map< String, T_*, std::less< String > >::iterator > getEntities() const;
 
     Variables getVariables() const
     {
@@ -295,19 +295,19 @@
 
 
 template <>
-inline System::Variables System::getEntities< Variable >() const
+inline typename System::Variables System::getEntities< Variable >() const
 {
     return getVariables();
 }
 
 template <>
-inline System::Processes System::getEntities< Process >() const
+inline typename System::Processes System::getEntities< Process >() const
 {
     return getProcesses();
 }
 
 template <>
-inline System::Systems   System::getEntities< System >() const
+inline typename System::Systems   System::getEntities< System >() const
 {
     return getSystems();
 }


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