/[escript]/branches/more_shared_ptrs_from_1812/escript/src/Data.h
ViewVC logotype

Diff of /branches/more_shared_ptrs_from_1812/escript/src/Data.h

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

revision 1034 by gross, Wed Mar 14 23:49:20 2007 UTC revision 1092 by gross, Fri Apr 13 03:39:49 2007 UTC
# Line 575  class Data { Line 575  class Data {
575    DataArrayView::ValueType::size_type    DataArrayView::ValueType::size_type
576    getLength() const;    getLength() const;
577    
578    
579    
580      /**
581         \brief
582         Assign the given value to the tag assocciated with name. Implicitly converts this
583         object to type DataTagged. Throws an exception if this object
584         cannot be converted to a DataTagged object or name cannot be mapped onto a tag key.
585         \param tagKey - Input - Integer key.
586         \param value - Input - Value to associate with given key.
587        ==>*
588      */
589      ESCRIPT_DLL_API
590      void
591      setTaggedValueByName(std::string name,
592                           const boost::python::object& value);
593    
594    /**    /**
595       \brief       \brief
596       Assign the given value to the tag. Implicitly converts this       Assign the given value to the tag. Implicitly converts this
# Line 1372  class Data { Line 1388  class Data {
1388    // pointer to the actual data object    // pointer to the actual data object
1389    boost::shared_ptr<DataAbstract> m_data;    boost::shared_ptr<DataAbstract> m_data;
1390    
   //  
   // pointer to the internal profiling data  
   struct profDataEntry *profData;  
   
1391  };  };
1392    
1393  template <class IValueType>  template <class IValueType>
# Line 1595  Data::binaryOp(const Data& right, Line 1607  Data::binaryOp(const Data& right,
1607       EsysAssert((leftC!=0 && rightC!=0), "Programming error - casting to DataConstant.");       EsysAssert((leftC!=0 && rightC!=0), "Programming error - casting to DataConstant.");
1608       escript::binaryOp(*leftC,*rightC,operation);       escript::binaryOp(*leftC,*rightC,operation);
1609     }     }
    #if defined DOPROF  
    profData->binary++;  
    #endif  
1610  }  }
1611    
1612  /**  /**

Legend:
Removed from v.1034  
changed lines
  Added in v.1092

  ViewVC Help
Powered by ViewVC 1.1.26