/[escript]/trunk/escript/src/Data.h
ViewVC logotype

Diff of /trunk/escript/src/Data.h

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

revision 2519 by jfenwick, Mon Jul 6 00:43:08 2009 UTC revision 2521 by jfenwick, Tue Jul 7 00:08:58 2009 UTC
# Line 1782  inline Line 1782  inline
1782  DataAbstract::ValueType::value_type*  DataAbstract::ValueType::value_type*
1783  Data::getSampleDataRW(DataAbstract::ValueType::size_type sampleNo)  Data::getSampleDataRW(DataAbstract::ValueType::size_type sampleNo)
1784  {  {
 //    if (isLazy())  
 //    {  
 //  resolve();  
 //    }  
 //    exclusiveWrite();  
1785     if (isLazy())     if (isLazy())
1786     {     {
1787      throw DataException("Error, attempt to acquire RW access to lazy data. Please call requireWrite() first.");      throw DataException("Error, attempt to acquire RW access to lazy data. Please call requireWrite() first.");
# Line 1794  Data::getSampleDataRW(DataAbstract::Valu Line 1789  Data::getSampleDataRW(DataAbstract::Valu
1789     return getReady()->getSampleDataRW(sampleNo);     return getReady()->getSampleDataRW(sampleNo);
1790  }  }
1791    
 // inline  
 // const DataAbstract::ValueType::value_type*  
 // Data::getSampleDataRO(DataAbstract::ValueType::size_type sampleNo, DataTypes::ValueType* buffer)  
 // {  
 //    DataLazy* l=dynamic_cast<DataLazy*>(m_data.get());  
 //    if (l!=0)  
 //    {  
 //  size_t offset=0;  
 //  if (buffer==NULL)  
 //  {  
 //      throw DataException("Error, attempt to getSampleDataRO for lazy Data with buffer==NULL");  
 //  }  
 //  const DataTypes::ValueType* res=l->resolveSample(*buffer,0,sampleNo,offset);  
 //  return &((*res)[offset]);  
 //    }  
 //    return getReady()->getSampleDataRO(sampleNo);  
 // }  
   
1792  inline  inline
1793  const DataAbstract::ValueType::value_type*  const DataAbstract::ValueType::value_type*
1794  Data::getSampleDataRO(DataAbstract::ValueType::size_type sampleNo, BufferGroup* bufferg)  Data::getSampleDataRO(DataAbstract::ValueType::size_type sampleNo, BufferGroup* bufferg)

Legend:
Removed from v.2519  
changed lines
  Added in v.2521

  ViewVC Help
Powered by ViewVC 1.1.26