Merge pull request #13 from jjdmol/master

C++11 fixes
casacore · Jun 18, 2016 · 0161036 · 0161036
2 parents 7da9387 + b574210
commit 0161036
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/synthesis/MeasurementComponents/AWProjectFT.cc b/synthesis/MeasurementComponents/AWProjectFT.cc
@@ -225,7 +225,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN
   //---------------------------------------------------------------
   //
   // This is nasty, we should use CountedPointers here.
-  AWProjectFT::~AWProjectFT() 
+  AWProjectFT::~AWProjectFT() CASAREST_NOEXCEPT
   {
       if(imageCache) delete imageCache; imageCache=0;
       if(gridder) delete gridder; gridder=0;

diff --git a/synthesis/MeasurementComponents/Utils.cc b/synthesis/MeasurementComponents/Utils.cc
@@ -249,8 +249,8 @@ namespace casa{
     IPosition ndx(3,0);
     Int N = vb.nRow();
     for(ndx(2)=0;ndx(2)<N;ndx(2)++)
-      if (isnan(vb.modelVisCube()(ndx).real()) ||
-	  isnan(vb.modelVisCube()(ndx).imag())
+      if (std::isnan(vb.modelVisCube()(ndx).real()) ||
+	  std::isnan(vb.modelVisCube()(ndx).imag())
 	  )
 	{
 	  ostringstream os;

diff --git a/synthesis/MeasurementComponents/nPBWProjectFT.cc b/synthesis/MeasurementComponents/nPBWProjectFT.cc
@@ -468,7 +468,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN
   //---------------------------------------------------------------
   //
   // This is nasty, we should use CountedPointers here.
-  nPBWProjectFT::~nPBWProjectFT() 
+  nPBWProjectFT::~nPBWProjectFT() CASAREST_NOEXCEPT
   {
       if(imageCache) delete imageCache; imageCache=0;
       if(gridder) delete gridder; gridder=0;