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

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

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

revision 2179 by caltinay, Thu Dec 18 00:23:55 2008 UTC revision 2199 by jfenwick, Thu Jan 8 06:10:52 2009 UTC
# Line 2293  escript::C_GeneralTensorProduct(Data& ar Line 2293  escript::C_GeneralTensorProduct(Data& ar
2293    // deal with any lazy data    // deal with any lazy data
2294  //   if (arg_0.isLazy()) {arg_0.resolve();}  //   if (arg_0.isLazy()) {arg_0.resolve();}
2295  //   if (arg_1.isLazy()) {arg_1.resolve();}  //   if (arg_1.isLazy()) {arg_1.resolve();}
2296    if (arg_0.isLazy() || arg_1.isLazy())    if (arg_0.isLazy() || arg_1.isLazy() || (AUTOLAZYON && (arg_0.isExpanded() || arg_1.isExpanded())))
2297    {    {
2298      DataLazy* c=new DataLazy(arg_0.borrowDataPtr(), arg_1.borrowDataPtr(), PROD, axis_offset,transpose);      DataLazy* c=new DataLazy(arg_0.borrowDataPtr(), arg_1.borrowDataPtr(), PROD, axis_offset,transpose);
2299      return Data(c);      return Data(c);

Legend:
Removed from v.2179  
changed lines
  Added in v.2199

  ViewVC Help
Powered by ViewVC 1.1.26