/[escript]/branches/schroedinger/escript/src/Data.h
ViewVC logotype

Diff of /branches/schroedinger/escript/src/Data.h

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

revision 1942 by jfenwick, Mon Oct 27 06:06:39 2008 UTC revision 1943 by jfenwick, Wed Oct 29 04:05:14 2008 UTC
# Line 202  class Data { Line 202  class Data {
202      Once you have passed the pointer, do not delete it.      Once you have passed the pointer, do not delete it.
203    */    */
204    ESCRIPT_DLL_API    ESCRIPT_DLL_API
205    Data(DataAbstract* underlyingdata);    explicit Data(DataAbstract* underlyingdata);
206    
207    /**    /**
208      \brief Create a Data based on the supplied DataAbstract      \brief Create a Data based on the supplied DataAbstract
209    */    */
210    ESCRIPT_DLL_API    ESCRIPT_DLL_API
211    Data(DataAbstract_ptr underlyingdata);    explicit Data(DataAbstract_ptr underlyingdata);
212    
213    /**    /**
214       \brief       \brief
# Line 1558  inline Line 1558  inline
1558  DataAbstract::ValueType::value_type*  DataAbstract::ValueType::value_type*
1559  Data::getSampleData(DataAbstract::ValueType::size_type sampleNo)  Data::getSampleData(DataAbstract::ValueType::size_type sampleNo)
1560  {  {
1561       if (isLazy())
1562       {
1563        resolve();
1564       }
1565     return getReady()->getSampleData(sampleNo);     return getReady()->getSampleData(sampleNo);
1566  }  }
1567    

Legend:
Removed from v.1942  
changed lines
  Added in v.1943

  ViewVC Help
Powered by ViewVC 1.1.26