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

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

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

revision 3268 by jfenwick, Thu Jun 10 01:48:41 2010 UTC revision 3269 by jfenwick, Wed Oct 13 03:21:50 2010 UTC
# Line 79  protected: Line 79  protected:
79    friend Data operator/(const escript::Data&, const boost::python::api::object&);    friend Data operator/(const escript::Data&, const boost::python::api::object&);
80    friend Data C_GeneralTensorProduct(escript::Data& arg_0, escript::Data& arg_1,    friend Data C_GeneralTensorProduct(escript::Data& arg_0, escript::Data& arg_1,
81                       int axis_offset, int transpose);                       int axis_offset, int transpose);
82    friend Data escript::condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);    friend Data condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);
83  };  };
84    
85    

Legend:
Removed from v.3268  
changed lines
  Added in v.3269

  ViewVC Help
Powered by ViewVC 1.1.26