/[escript]/branches/windows_from_1456_trunk_1580_merged_in/escript/src/FunctionSpace.cpp
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1580_merged_in/escript/src/FunctionSpace.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1603 by phornby, Wed Jun 4 07:10:43 2008 UTC revision 1604 by phornby, Sat Jun 14 10:06:31 2008 UTC
# Line 67  FunctionSpace::getDomain() const Line 67  FunctionSpace::getDomain() const
67    return *m_domain;    return *m_domain;
68  }  }
69    
70  const std::string &  std::string
71  FunctionSpace::toString() const  FunctionSpace::toString() const
72  {  {
73    std::stringstream temp;    std::stringstream temp;
74    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)
75         << " on " << m_domain->getDescription();         << " on " << m_domain->getDescription();
76    
77    type_str = temp.str();    return temp.str();
   
   return type_str;  
78  }  }
79    
80    
# Line 90  FunctionSpace::toPyString() const Line 88  FunctionSpace::toPyString() const
88    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)
89         << " on " << m_domain->getDescription();         << " on " << m_domain->getDescription();
90    
91    //toString();    return cvtr(temp.str());
   type_str = temp.str();  
   
   return cvtr(type_str);  
92  }  }
93  #endif  #endif
94    

Legend:
Removed from v.1603  
changed lines
  Added in v.1604

  ViewVC Help
Powered by ViewVC 1.1.26