/[escript]/trunk/escript/src/DataLazy.cpp
ViewVC logotype

Diff of /trunk/escript/src/DataLazy.cpp

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

revision 3489 by caltinay, Thu Oct 28 00:50:41 2010 UTC revision 3490 by caltinay, Wed Mar 30 02:24:33 2011 UTC
# Line 1386  DataLazy::resolveNodeCondEval(int tid, i Line 1386  DataLazy::resolveNodeCondEval(int tid, i
1386      throw DataException("Programmer error - resolveNodeCondEval should only be called on CONDEVAL nodes.");      throw DataException("Programmer error - resolveNodeCondEval should only be called on CONDEVAL nodes.");
1387    }    }
1388    size_t subroffset;    size_t subroffset;
   size_t offset;  
   
1389    
1390    const ValueType* maskres=m_mask->resolveNodeSample(tid, sampleNo, subroffset);    const ValueType* maskres=m_mask->resolveNodeSample(tid, sampleNo, subroffset);
1391    const ValueType* srcres=0;    const ValueType* srcres=0;
# Line 1403  DataLazy::resolveNodeCondEval(int tid, i Line 1401  DataLazy::resolveNodeCondEval(int tid, i
1401    // Now we need to copy the result    // Now we need to copy the result
1402    
1403    roffset=m_samplesize*tid;    roffset=m_samplesize*tid;
   offset=roffset;  
1404    for (int i=0;i<m_samplesize;++i)    for (int i=0;i<m_samplesize;++i)
1405    {    {
1406      m_samples[roffset+i]=(*srcres)[subroffset+i];        m_samples[roffset+i]=(*srcres)[subroffset+i];  

Legend:
Removed from v.3489  
changed lines
  Added in v.3490

  ViewVC Help
Powered by ViewVC 1.1.26