/[escript]/branches/windows_from_1456_trunk_1580_merged_in/escript/src/DataArrayView.h
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1580_merged_in/escript/src/DataArrayView.h

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

revision 1601 by phornby, Thu Jun 12 10:31:03 2008 UTC revision 1602 by phornby, Sat Jun 14 09:20:06 2008 UTC
# Line 560  class DataArrayView { Line 560  class DataArrayView {
560    */    */
561    ESCRIPT_DLL_API    ESCRIPT_DLL_API
562    static    static
563    const ShapeType &    ShapeType
564    getResultSliceShape(const RegionType& region);    getResultSliceShape(const RegionType& region);
565    
566    /**    /**
# Line 876  class DataArrayView { Line 876  class DataArrayView {
876    */    */
877    ESCRIPT_DLL_API    ESCRIPT_DLL_API
878    static    static
879    const ShapeType &    ShapeType
880    determineResultShape(const DataArrayView& left,    determineResultShape(const DataArrayView& left,
881                         const DataArrayView& right);                         const DataArrayView& right);
882    
# Line 1523  class DataArrayView { Line 1523  class DataArrayView {
1523    // This can be derived from m_shape by multiplying the size of each dimension, but    // This can be derived from m_shape by multiplying the size of each dimension, but
1524    // is stored here for convenience.    // is stored here for convenience.
1525    int m_noValues;    int m_noValues;
   
   // FIXME: this breaks thread safety.  
   // For some reason I cannot yet grok, windows hates returning  
   // any structure by value across dll boundaries. This is a fix for  
   // getResultSliceShape and determineResultShape  
   // these methods no longer return a copy of a temporary;  
   // but instead return a reference to this class member.  
   // It is class-wide static because the two methods in question are static.  
   static DataArrayView::ShapeType return_shape;  
   
1526  };  };
1527    
1528  ESCRIPT_DLL_API bool operator==(const DataArrayView& left, const DataArrayView& right);  ESCRIPT_DLL_API bool operator==(const DataArrayView& left, const DataArrayView& right);

Legend:
Removed from v.1601  
changed lines
  Added in v.1602

  ViewVC Help
Powered by ViewVC 1.1.26