Changeset 2885 in Sophya

Timestamp:

Jan 4, 2006, 2:36:47 PM (20 years ago)

Author:

ansari

Message:

Modifs (ajout this->) pour compilation avec g++ 4 (V >= 3.4) - Reza 4 Jan 2006

Location:

trunk/SophyaLib

Files:

• NTools/cimage.cc (modified) (4 diffs)
• NTools/cimage.h (modified) (2 diffs)
• Samba/alm.cc (modified) (1 diff)
• Samba/alm.h (modified) (1 diff)
• SkyMap/localmap.cc (modified) (5 diffs)
• SkyMap/localmap.h (modified) (1 diff)
• SkyMap/spherehealpix.cc (modified) (6 diffs)
• SkyMap/spherethetaphi.cc (modified) (6 diffs)
• SkyMap/sphericalmap.h (modified) (1 diff)

trunk/SophyaLib/NTools/cimage.cc

@@ -101 +101 @@
   : FIO_TArray<T>()
 { 
-  dobj = new Image<T>(obj, true);
-  ownobj=true; 
+  this->dobj = new Image<T>(obj, true);
+  this->ownobj=true; 
 }
 
@@ -124 +124 @@
     throw TypeMismatchExc(PExcLongMessage(buff));        
   }
-  if (ownobj && dobj) delete dobj;
-  dobj = po; ownobj = false;
+  if (this->ownobj && this->dobj) delete this->dobj;
+  this->dobj = po; this->ownobj = false;
 } 
 
@@ -131 +131 @@
 void FIO_Image<T>::ReadSelf(PInPersist& is)
 {
-  if (dobj == NULL) dobj = new Image<T>;
-  Image<T> * img = dynamic_cast<Image<T> * > (dobj);
+  if (this->dobj == NULL) this->dobj = new Image<T>;
+  Image<T> * img = dynamic_cast<Image<T> * > (this->dobj);
 // On lit les 3 premiers uint_4
 //  0: Numero de version,  1 : reserve
@@ -155 +155 @@
 void FIO_Image<T>::WriteSelf(POutPersist& os) const
 {
-  if (dobj == NULL)   return;
-  Image<T> * img = dynamic_cast<Image<T> * > (dobj);
+  if (this->dobj == NULL)   return;
+  Image<T> * img = dynamic_cast<Image<T> * > (this->dobj);
 //  On ecrit 3 uint_4 .... 
   uint_4 itab[3];

trunk/SophyaLib/NTools/cimage.h

@@ -33 +33 @@
 
   //! Returns the image size along X (corresponding to the number of columns)  
-  inline sa_size_t  XSize() const {return NCols();}
+  inline sa_size_t  XSize() const {return this->NCols();}
   //! Returns the image size along Y (corresponding to the number of lines)  
-  inline sa_size_t  YSize() const {return NRows();}
+  inline sa_size_t  YSize() const {return this->NRows();}
 
   //! Returns the X position, for pixel(0,0)
@@ -89 +89 @@
   //  virtual ~FIO_Image();  
   virtual void        SetDataObj(AnyDataObj & o);
-  inline operator Image<T>() { return(*(dynamic_cast<Image<T> * >(dobj))); }
+  inline operator Image<T>() { return(*(dynamic_cast<Image<T> * >(this->dobj))); }
 protected :
   virtual void ReadSelf(PInPersist&);           

trunk/SophyaLib/Samba/alm.cc

@@ -22 +22 @@
 
   //alm.ReSize(nlmax);
-  ReSizeRow(nlmax+1);
+  this->ReSizeRow(nlmax+1);
 
   r_8 sig_smooth = fwhm/sqrt(8.*log(2.))/(60.*180.)* M_PI;

trunk/SophyaLib/Samba/alm.h

@@ -26 +26 @@
 Alm(const TVector<T>& clin, const r_8 fwhm) ;
 /*! resize with a new lmax */
-inline void ReSizeToLmax(int_4 nlmax) {ReSizeRow(nlmax+1);}
-inline int_4 Lmax() const {return rowNumber()-1;}
+inline void ReSizeToLmax(int_4 nlmax) {this->ReSizeRow(nlmax+1);}
+inline int_4 Lmax() const {return this->rowNumber()-1;}
 TVector<T> powerSpectrum() const;
 

trunk/SophyaLib/SkyMap/localmap.cc

@@ -181 +181 @@
 {
 
-  if(lm.mInfo_) mInfo_= new DVList(*lm.mInfo_);
+  if(lm.mInfo_) this->mInfo_= new DVList(*lm.mInfo_);
   recopierVariablesSimples(lm);
 }
@@ -196 +196 @@
 {
 
-  if(lm.mInfo_) mInfo_= new DVList(*lm.mInfo_);
+  if(lm.mInfo_) this->mInfo_= new DVList(*lm.mInfo_);
   recopierVariablesSimples(lm);
 }
@@ -236 +236 @@
       recopierVariablesSimples(a);     
       pixels_.CloneOrShare(a.pixels_);
-      if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-      if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+      if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 template<class T>
@@ -244 +244 @@
       recopierVariablesSimples(a);     
       pixels_.Share(a.pixels_);
-      if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-      if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+      if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 
@@ -271 +271 @@
       if (NbPixels() < 1) CloneOrShare(a);
       else CopyElt(a);
-      if (mInfo_) delete mInfo_;
-      mInfo_ = NULL;
-      if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+      if (this->mInfo_) delete this->mInfo_;
+      this->mInfo_ = NULL;
+      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
     }
   return(*this);

trunk/SophyaLib/SkyMap/localmap.h

@@ -54 +54 @@
 // ---------- Overloading of () to access pixel number k ----
 
-inline T& operator()(int_4 k) {return(PixVal(k));}
-inline T const& operator()(int_4 k) const {return(PixVal(k));}
-inline T& operator()(int_4 ix, int_4 iy) {return PixVal(iy*nSzX_+ix);};
-inline T const& operator()(int_4 ix, int_4 iy) const {return PixVal(iy*nSzX_+ix);};
+inline T& operator()(int_4 k) {return(this->PixVal(k));}
+inline T const& operator()(int_4 k) const {return(this->PixVal(k));}
+inline T& operator()(int_4 ix, int_4 iy) {return this->PixVal(iy*nSzX_+ix);};
+inline T const& operator()(int_4 ix, int_4 iy) const {return this->PixVal(iy*nSzX_+ix);};
 
 // Acces a un pixel 
-inline T& operator()(double theta,double phi) {return(PixValSph(theta,phi));};
-inline T  const& operator()(double theta,double phi) const {return(PixValSph(theta,phi));};
+inline T& operator()(double theta,double phi) {return(this->PixValSph(theta,phi));};
+inline T  const& operator()(double theta,double phi) const {return(this->PixValSph(theta,phi));};
    
 // ---------- Definition of PixelMap abstract methods -------

trunk/SophyaLib/SkyMap/spherehealpix.cc

@@ -113 +113 @@
   nPix_ = s.nPix_;
   omeg_ = s.omeg_;
-  if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
+  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
 }
 //++
@@ -126 +126 @@
   nPix_ = s.nPix_;
   omeg_ = s.omeg_;
-  if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
+  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
   //  CloneOrShare(s);
 }
@@ -141 +141 @@
   sliceBeginIndex_.CloneOrShare(a.sliceBeginIndex_);
   sliceLenght_.CloneOrShare(a.sliceLenght_);
-  if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-  if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 
@@ -155 +155 @@
   sliceBeginIndex_.Share(a.sliceBeginIndex_);
   sliceLenght_.Share(a.sliceLenght_);
-  if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-  if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 
@@ -172 +172 @@
       
       
-      if (mInfo_) delete mInfo_;
-      mInfo_ = NULL;
-      if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+      if (this->mInfo_) delete this->mInfo_;
+      this->mInfo_ = NULL;
+      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
     }
   return(*this);
@@ -674 +674 @@
 void SphereHEALPix<T>::print(ostream& os) const
 {
-  if(mInfo_) os << "  DVList Info= " << *mInfo_ << endl;
+  if(this->mInfo_) os << "  DVList Info= " << *(this->mInfo_) << endl;
   //
   os << " nSide_ = " << nSide_  << endl;

trunk/SophyaLib/SkyMap/spherethetaphi.cc

@@ -81 +81 @@
   NPix_  = s.NPix_;
   Omega_ = s.Omega_;
-  if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
+  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
 }
 
@@ -92 +92 @@
   NPix_  = s.NPix_;
   Omega_ = s.Omega_;
-  if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
+  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
 }
 
@@ -139 +139 @@
   Theta_.CloneOrShare(a.Theta_);
   pixels_.CloneOrShare(a.pixels_);
-  if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-  if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 template<class T>
@@ -153 +153 @@
   Theta_.Share(a.Theta_);
   pixels_.Share(a.pixels_);
-  if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
-  if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
+  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
 }
 
@@ -169 +169 @@
       if (NbPixels() < 1) CloneOrShare(a);
       else CopyElt(a);
-      if (mInfo_) delete mInfo_;
-      mInfo_ = NULL;
-      if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
+      if (this->mInfo_) delete this->mInfo_;
+      this->mInfo_ = NULL;
+      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
     }
   return(*this);
@@ -697 +697 @@
 void SphereThetaPhi<T>::print(ostream& os) const
 {
-  if(mInfo_) os << "  DVList Info= " << *mInfo_ << endl;
+  if(this->mInfo_) os << "  DVList Info= " << *(this->mInfo_) << endl;
   //
   os << " NTheta_= " << NTheta_ << endl;

trunk/SophyaLib/SkyMap/sphericalmap.h

@@ -38 +38 @@
 
 // Overloading of () to access pixel number k.
-inline T& operator()(int k) {return(PixVal(k));}
-inline T  const& operator()(int k) const {return(PixVal(k));}
-inline T& operator()(double theta,double phi) {return(PixValSph(theta,phi));};
-inline T  const& operator()(double theta,double phi) const {return(PixValSph(theta,phi));};
+inline T& operator()(int k) {return(this->PixVal(k));}
+inline T  const& operator()(int k) const {return(this->PixVal(k));}
+inline T& operator()(double theta,double phi) {return(this->PixValSph(theta,phi));};
+inline T  const& operator()(double theta,double phi) const {return(this->PixValSph(theta,phi));};
 
 // index characterizing the size pixelization : m for SphereThetaPhi