/[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 2785 by lgao, Thu Nov 26 05:17:40 2009 UTC revision 2827 by jfenwick, Fri Dec 18 03:41:09 2009 UTC
# Line 27  Line 27 
27  #include "DataException.h"  #include "DataException.h"
28    
29    
30    
31  extern "C" {  extern "C" {
32  #include "DataC.h"  #include "DataC.h"
33  //#include <omp.h>  //#include <omp.h>
# Line 568  If false, the result is a list of scalar Line 569  If false, the result is a list of scalar
569      \brief      \brief
570      Return the sample data for the given sample no. This is not the      Return the sample data for the given sample no. This is not the
571      preferred interface but is provided for use by C code.      preferred interface but is provided for use by C code.
     The bufferg parameter is only required for LazyData.  
572      \param sampleNo - Input - the given sample no.      \param sampleNo - Input - the given sample no.
573      \return pointer to the sample data.      \return pointer to the sample data.
574  */  */
# Line 1756  template <class BinaryOp> Line 1756  template <class BinaryOp>
1756    void set_m_data(DataAbstract_ptr p);    void set_m_data(DataAbstract_ptr p);
1757    
1758    friend class DataAbstract;        // To allow calls to updateShareStatus    friend class DataAbstract;        // To allow calls to updateShareStatus
1759    #ifdef IKNOWWHATIMDOING
1760      friend Data applyBinaryCFunction(boost::python::object cfunc, boost::python::tuple shape, escript::Data& d, escript::Data& e);
1761    #endif
1762  };  };
1763    
1764    
1765    #ifdef IKNOWWHATIMDOING
1766    ESCRIPT_DLL_API
1767    Data
1768    applyBinaryCFunction(boost::python::object func, boost::python::tuple shape, escript::Data& d, escript::Data& e);
1769    #endif
1770    
1771    
1772  }   // end namespace escript  }   // end namespace escript
1773    
1774    

Legend:
Removed from v.2785  
changed lines
  Added in v.2827

  ViewVC Help
Powered by ViewVC 1.1.26