Changeset 3029 for trunk/external-alma

Timestamp:

03/03/15 18:26:31 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-6929)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap as a whole

Description: committing Darrell's changes to make asap work with merged casacore.

Location:

trunk/external-alma

Files:

• atnf/PKSIO/FITSreader.cc (modified) (1 diff)
• atnf/pks/pks_maths.cc (modified) (1 diff)
• components/SpectralComponents/SpectralElement.cc (modified) (3 diffs)
• components/SpectralComponents/SpectralElement.h (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/FITSreader.cc

@@ -38 +38 @@
 
 #include <atnf/PKSIO/FITSreader.h>
-
 #include <algorithm>
+#include <cstdlib>
 
 using namespace std;

trunk/external-alma/atnf/pks/pks_maths.cc

@@ -35 +35 @@
 
 // AIPS++ includes.
+#include <complex>
 #include <casa/aips.h>
 #include <casa/math.h>

trunk/external-alma/components/SpectralComponents/SpectralElement.cc

@@ -53 +53 @@
   _fixed(other._fixed.copy()),
   _function(
-                std::tr1::shared_ptr<Function<Double, Double> >(
+                SHARED_PTR<Function<Double, Double> >(
                         other._function->clone()
                 )
@@ -72 +72 @@
                 _fixed.resize(n);
                 _fixed = other._fixed.copy();
-                _function = std::tr1::shared_ptr<Function<Double, Double> >(
+                _function = SHARED_PTR<Function<Double, Double> >(
                         other._function->clone()
                 );
@@ -165 +165 @@
 
 void SpectralElement::_setFunction(
-        const std::tr1::shared_ptr<Function<Double, Double> >& f
+        const SHARED_PTR<Function<Double, Double> >& f
 ) {
         _function = f;

trunk/external-alma/components/SpectralComponents/SpectralElement.h

@@ -30 +30 @@
 #define COMPONENTS_SPECTRALELEMENT_H
 
+#include <memory>
 #include <casa/aips.h>
 #include <casa/Arrays/Vector.h>
 #include <casa/Containers/RecordInterface.h>
-///#include <casa/Utilities/CountedPtr.h>
-#include <tr1/memory>
 
 namespace casa { //# NAMESPACE CASA - BEGIN
@@ -174 +173 @@
         void _setType(const Types type);
 
-        void _setFunction(const std::tr1::shared_ptr<Function<Double, Double> >& f);
-
-        virtual std::tr1::shared_ptr<Function<Double, Double> > _getFunction() const {
+        void _setFunction(const SHARED_PTR<Function<Double, Double> >& f);
+
+        virtual SHARED_PTR<Function<Double, Double> > _getFunction() const {
                 return _function;
         }
@@ -194 +193 @@
         Vector<Bool> _fixed;
 
-        std::tr1::shared_ptr<Function<Double, Double> > _function;
+        SHARED_PTR<Function<Double, Double> > _function;
 
 };