/[escript]/trunk-mpi-branch/escript/src/Data.h
ViewVC logotype

Diff of /trunk-mpi-branch/escript/src/Data.h

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

revision 1086 by gross, Thu Mar 8 02:49:52 2007 UTC revision 1087 by gross, Thu Apr 12 10:01:47 2007 UTC
# Line 1376  class Data { Line 1376  class Data {
1376    // pointer to the actual data object    // pointer to the actual data object
1377    boost::shared_ptr<DataAbstract> m_data;    boost::shared_ptr<DataAbstract> m_data;
1378    
   //  
   // pointer to the internal profiling data  
   struct profDataEntry *profData;  
   
1379  };  };
1380    
1381  template <class IValueType>  template <class IValueType>
# Line 1599  Data::binaryOp(const Data& right, Line 1595  Data::binaryOp(const Data& right,
1595       EsysAssert((leftC!=0 && rightC!=0), "Programming error - casting to DataConstant.");       EsysAssert((leftC!=0 && rightC!=0), "Programming error - casting to DataConstant.");
1596       escript::binaryOp(*leftC,*rightC,operation);       escript::binaryOp(*leftC,*rightC,operation);
1597     }     }
    #if defined DOPROF  
    profData->binary++;  
    #endif  
1598  }  }
1599    
1600  /**  /**

Legend:
Removed from v.1086  
changed lines
  Added in v.1087

  ViewVC Help
Powered by ViewVC 1.1.26