Changeset 2885 in Sophya for trunk/SophyaLib/SkyMap


Ignore:
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/SkyMap
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/SkyMap/localmap.cc

    r2869 r2885  
    181181{
    182182
    183   if(lm.mInfo_) mInfo_= new DVList(*lm.mInfo_);
     183  if(lm.mInfo_) this->mInfo_= new DVList(*lm.mInfo_);
    184184  recopierVariablesSimples(lm);
    185185}
    … …  
    196196{
    197197
    198   if(lm.mInfo_) mInfo_= new DVList(*lm.mInfo_);
     198  if(lm.mInfo_) this->mInfo_= new DVList(*lm.mInfo_);
    199199  recopierVariablesSimples(lm);
    200200}
    … …  
    236236      recopierVariablesSimples(a);     
    237237      pixels_.CloneOrShare(a.pixels_);
    238       if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    239       if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     238      if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     239      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    240240}
    241241template<class T>
    … …  
    244244      recopierVariablesSimples(a);     
    245245      pixels_.Share(a.pixels_);
    246       if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    247       if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     246      if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     247      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    248248}
    249249
    … …  
    271271      if (NbPixels() < 1) CloneOrShare(a);
    272272      else CopyElt(a);
    273       if (mInfo_) delete mInfo_;
    274       mInfo_ = NULL;
    275       if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     273      if (this->mInfo_) delete this->mInfo_;
     274      this->mInfo_ = NULL;
     275      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    276276    }
    277277  return(*this);

  • trunk/SophyaLib/SkyMap/localmap.h

    r2433 r2885  
    5454// ---------- Overloading of () to access pixel number k ----
    5555
    56 inline T& operator()(int_4 k) {return(PixVal(k));}
    57 inline T const& operator()(int_4 k) const {return(PixVal(k));}
    58 inline T& operator()(int_4 ix, int_4 iy) {return PixVal(iy*nSzX_+ix);};
    59 inline T const& operator()(int_4 ix, int_4 iy) const {return PixVal(iy*nSzX_+ix);};
     56inline T& operator()(int_4 k) {return(this->PixVal(k));}
     57inline T const& operator()(int_4 k) const {return(this->PixVal(k));}
     58inline T& operator()(int_4 ix, int_4 iy) {return this->PixVal(iy*nSzX_+ix);};
     59inline T const& operator()(int_4 ix, int_4 iy) const {return this->PixVal(iy*nSzX_+ix);};
    6060
    6161// Acces a un pixel
    62 inline T& operator()(double theta,double phi) {return(PixValSph(theta,phi));};
    63 inline T  const& operator()(double theta,double phi) const {return(PixValSph(theta,phi));};
     62inline T& operator()(double theta,double phi) {return(this->PixValSph(theta,phi));};
     63inline T  const& operator()(double theta,double phi) const {return(this->PixValSph(theta,phi));};
    6464   
    6565// ---------- Definition of PixelMap abstract methods -------

  • trunk/SophyaLib/SkyMap/spherehealpix.cc

    r2869 r2885  
    113113  nPix_ = s.nPix_;
    114114  omeg_ = s.omeg_;
    115   if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
     115  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
    116116}
    117117//++
    … …  
    126126  nPix_ = s.nPix_;
    127127  omeg_ = s.omeg_;
    128   if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
     128  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
    129129  //  CloneOrShare(s);
    130130}
    … …  
    141141  sliceBeginIndex_.CloneOrShare(a.sliceBeginIndex_);
    142142  sliceLenght_.CloneOrShare(a.sliceLenght_);
    143   if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    144   if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     143  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     144  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    145145}
    146146
    … …  
    155155  sliceBeginIndex_.Share(a.sliceBeginIndex_);
    156156  sliceLenght_.Share(a.sliceLenght_);
    157   if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    158   if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     157  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     158  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    159159}
    160160
    … …  
    172172     
    173173     
    174       if (mInfo_) delete mInfo_;
    175       mInfo_ = NULL;
    176       if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     174      if (this->mInfo_) delete this->mInfo_;
     175      this->mInfo_ = NULL;
     176      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    177177    }
    178178  return(*this);
    … …  
    674674void SphereHEALPix<T>::print(ostream& os) const
    675675{
    676   if(mInfo_) os << "  DVList Info= " << *mInfo_ << endl;
     676  if(this->mInfo_) os << "  DVList Info= " << *(this->mInfo_) << endl;
    677677  //
    678678  os << " nSide_ = " << nSide_  << endl;

  • trunk/SophyaLib/SkyMap/spherethetaphi.cc

    r2869 r2885  
    8181  NPix_  = s.NPix_;
    8282  Omega_ = s.Omega_;
    83   if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
     83  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
    8484}
    8585
    … …  
    9292  NPix_  = s.NPix_;
    9393  Omega_ = s.Omega_;
    94   if(s.mInfo_) mInfo_= new DVList(*s.mInfo_);
     94  if(s.mInfo_) this->mInfo_= new DVList(*s.mInfo_);
    9595}
    9696
    … …  
    139139  Theta_.CloneOrShare(a.Theta_);
    140140  pixels_.CloneOrShare(a.pixels_);
    141   if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    142   if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     141  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     142  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    143143}
    144144template<class T>
    … …  
    153153  Theta_.Share(a.Theta_);
    154154  pixels_.Share(a.pixels_);
    155   if (mInfo_) {delete mInfo_; mInfo_ = NULL;}
    156   if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     155  if (this->mInfo_) {delete this->mInfo_; this->mInfo_ = NULL;}
     156  if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    157157}
    158158
    … …  
    169169      if (NbPixels() < 1) CloneOrShare(a);
    170170      else CopyElt(a);
    171       if (mInfo_) delete mInfo_;
    172       mInfo_ = NULL;
    173       if (a.mInfo_) mInfo_ = new DVList(*(a.mInfo_));
     171      if (this->mInfo_) delete this->mInfo_;
     172      this->mInfo_ = NULL;
     173      if (a.mInfo_) this->mInfo_ = new DVList(*(a.mInfo_));
    174174    }
    175175  return(*this);
    … …  
    697697void SphereThetaPhi<T>::print(ostream& os) const
    698698{
    699   if(mInfo_) os << "  DVList Info= " << *mInfo_ << endl;
     699  if(this->mInfo_) os << "  DVList Info= " << *(this->mInfo_) << endl;
    700700  //
    701701  os << " NTheta_= " << NTheta_ << endl;

  • trunk/SophyaLib/SkyMap/sphericalmap.h

    r1375 r2885  
    3838
    3939// Overloading of () to access pixel number k.
    40 inline T& operator()(int k) {return(PixVal(k));}
    41 inline T  const& operator()(int k) const {return(PixVal(k));}
    42 inline T& operator()(double theta,double phi) {return(PixValSph(theta,phi));};
    43 inline T  const& operator()(double theta,double phi) const {return(PixValSph(theta,phi));};
     40inline T& operator()(int k) {return(this->PixVal(k));}
     41inline T  const& operator()(int k) const {return(this->PixVal(k));}
     42inline T& operator()(double theta,double phi) {return(this->PixValSph(theta,phi));};
     43inline T  const& operator()(double theta,double phi) const {return(this->PixValSph(theta,phi));};
    4444
    4545// index characterizing the size pixelization : m for SphereThetaPhi
Note: See TracChangeset for help on using the changeset viewer.