[Sdif-cvs] Easdif/easdif sdif_matrix.hpp,1.10,1.11

[Axel R. <ro...@us...>]

Update of /cvsroot/sdif/Easdif/easdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17880

Modified Files:
	sdif_matrix.hpp 
Log Message:
Added throw specifications.


Index: sdif_matrix.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sdif_matrix.hpp	2 Sep 2012 01:10:27 -0000	1.10
--- sdif_matrix.hpp	23 May 2014 10:23:46 -0000	1.11
***************
*** 37,40 ****
--- 37,43 ----
   * 
   * $Log$
+  * Revision 1.11  2014/05/23 10:23:46  roebel
+  * Added throw specifications.
+  *
   * Revision 1.10  2012/09/02 01:10:27  roebel
   * Fixed confusing argument names.
***************
*** 486,489 ****
--- 489,508 ----
      std::string GetColName(int i) const;
  
+     /** 
+      * \ingroup membmat
+      * get a void pointer to the start of the memory of the internal matrix
+      * @return void * to internal data
+      */
+     void* GetData() {
+       return mInter->GetData();
+     }
+ 
+     /** 
+      * \ingroup membmat
+      * @return element size in bytes of internal representation
+      */
+     int GetElementSize()	{
+       return mInter->GetElementSize();
+     }
  
  
***************
*** 519,523 ****
       * @return the value
       */
!     int GetUChar(int i, int j) const {return mInter->GetUChar(i, j);};
  
      /**
--- 538,543 ----
       * @return the value
       */
!     int GetUChar(int i, int j) const throw (SDIFArrayPosition){
!       return mInter->GetUChar(i, j);};
  
      /**
***************
*** 529,533 ****
       * @return the value
       */
!     int GetInt(int i, int j) const {return mInter->GetInt(i, j);};
  
  
--- 549,554 ----
       * @return the value
       */
!     int GetInt(int i, int j) const throw (SDIFArrayPosition){
!       return mInter->GetInt(i, j);};
  
  
***************
*** 540,544 ****
       * @return the value
       */
!     float GetFloat(int i, int j)const {    return mInter->GetFloat(i, j);}
  
      /**
--- 561,566 ----
       * @return the value
       */
!     float GetFloat(int i, int j)const throw (SDIFArrayPosition){ 
!       return mInter->GetFloat(i, j);}
  
      /**
***************
*** 551,555 ****
       * @return the value
       */
!     double GetDouble(int i, int j) const {   return mInter->GetDouble(i, j);}
  
  
--- 573,578 ----
       * @return the value
       */
!     double GetDouble(int i, int j) const throw (SDIFArrayPosition) {
!       return mInter->GetDouble(i, j);}
  
  
***************
*** 564,568 ****
       */
      template<typename Tout>
!     void Get(int i, int j, Tout& value)
      {
        value = static_cast<Tout>(mInter->GetDouble(i, j));
--- 587,591 ----
       */
      template<typename Tout>
!     void Get(int i, int j, Tout& value) const throw (SDIFArrayPosition)
      {
        value = static_cast<Tout>(mInter->GetDouble(i, j));
***************
*** 570,574 ****
  
      // specialization for float that does not use cast
!     void Get(int i, int j, float& value)
      {
        value = mInter->GetFloat(i, j);
--- 593,597 ----
  
      // specialization for float that does not use cast
!     void Get(int i, int j, float& value) const throw (SDIFArrayPosition)
      {
        value = mInter->GetFloat(i, j);
***************
*** 576,580 ****
    
      // specialization for int that does not use cast
!     void Get(int i, int j, int& value)
      {
        value = mInter->GetInt(i, j);
--- 599,603 ----
    
      // specialization for int that does not use cast
!     void Get(int i, int j, int& value)  const throw (SDIFArrayPosition)
      {
        value = mInter->GetInt(i, j);
***************
*** 584,589 ****
  
      // std::string Get() ??? exception when not string matrix?
!     void Get(std::string& value)
!       throw(SDIFMatrixDataError)
      {
  
--- 607,611 ----
  
      // std::string Get() ??? exception when not string matrix?
!     void Get(std::string& value)  const throw(SDIFMatrixDataError)
      {
  
***************
*** 678,697 ****
       */
      template<typename Tin>
!     void Set(int i, int j, const Tin& value)
      {
        mInter->Set(i, j, static_cast<double>(value) );
      }
    
!     void Set(int i, int j, const float value)
      {
        mInter->Set(i, j, value);
      }
    
!     void Set(int i, int j, const int value)
      {
        mInter->Set(i, j, value);
      }
  
!     void Set(int i, int j, const unsigned char value)
      {
        mInter->Set(i, j, value);
--- 700,719 ----
       */
      template<typename Tin>
!     void Set(int i, int j, const Tin& value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, static_cast<double>(value) );
      }
    
!     void Set(int i, int j, const float value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
      }
    
!     void Set(int i, int j, const int value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
      }
  
!     void Set(int i, int j, const unsigned char value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
***************
*** 699,703 ****
  
  
- 
      /** 
       * Set matrix type to eText, change matrix size to num. of bytes in
--- 721,724 ----