Changeset 3106 for trunk/external-alma/components/SpectralComponents/SpectralList.h

Timestamp:

10/04/16 18:20:50 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Check-in asap modifications from Jim regarding casacore namespace conversion.

File:

• trunk/external-alma/components/SpectralComponents/SpectralList.h (modified) (10 diffs)

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

@@ -18 +18 @@
 //#
 //# Correspondence concerning AIPS++ should be addressed as follows:
-//#        Internet email: aips2-request@nrao.edu.
+//#        casacore::Internet email: aips2-request@nrao.edu.
 //#        Postal address: AIPS++ Project Office
 //#                        National Radio Astronomy Observatory
@@ -34 +34 @@
 #include <casa/Containers/Block.h>
 
+namespace casacore {
+
+    class RecordInterface;
+    class String;
+    template <class T> class Vector;
+}
+
 namespace casa { //# NAMESPACE CASA - BEGIN
 
 //# Forward Declarations
 class SpectralElement;
-class RecordInterface;
-class String;
-template <class T> class Vector;
 
 // <summary>
@@ -86 +90 @@
   SpectralList();
   // Construct a list with a maximum length of n (0: unlimited length)
-  explicit SpectralList(uInt nmax);
+  explicit SpectralList(casacore::uInt nmax);
   // Construct with an initial element
   explicit SpectralList(const SpectralElement &in);
@@ -100 +104 @@
   SpectralList &operator=(const SpectralList &other);
   // Evaluate the value of the sum of the elements at x
-  Double operator()(const Double x) const;
+  casacore::Double operator()(const casacore::Double x) const;
   // Get element n
   // <thrown>
@@ -106 +110 @@
   // </thrown>
   // <group>
-  const SpectralElement* operator[](const uInt n) const;
-  SpectralElement* operator[](const uInt n);
+  const SpectralElement* operator[](const casacore::uInt n) const;
+  SpectralElement* operator[](const casacore::uInt n);
   // </group>
 
   //# Member functions
   // Get the number of elements in list
-  uInt nelements() const { return list_p.nelements(); };
+  casacore::uInt nelements() const { return list_p.nelements(); };
 
   // Get the profile values for all elements in list. The evaluation
@@ -138 +142 @@
   // Add elements to list (False if list has max length and full)
   // <group>
-  Bool add(const SpectralElement &in);
-  Bool add(const SpectralList &in);
+  casacore::Bool add(const SpectralElement &in);
+  casacore::Bool add(const SpectralList &in);
   // </group>
   // Insert in sort order in the list
@@ -148 +152 @@
   // Set an element in the list. Return False if more than one place beyond
   // end of list; or if beyond max size.
-  Bool set(const SpectralElement &in, const uInt which);
+  casacore::Bool set(const SpectralElement &in, const casacore::uInt which);
 
   // Clear the list
@@ -154 +158 @@
 
   // Set a maximum size of the list
-  void set(const uInt nmax);
+  void set(const casacore::uInt nmax);
 
   // Sort the list on the first parameter (i.e. peak value for Gaussian)
@@ -161 +165 @@
   // Convert to and from a Record (see details in SpectralElement)
   // <group>
-  Bool fromRecord (String& errMsg, const RecordInterface& container);
-  Bool toRecord(RecordInterface& container) const;
+  casacore::Bool fromRecord (casacore::String& errMsg, const casacore::RecordInterface& container);
+  casacore::Bool toRecord(casacore::RecordInterface& container) const;
   //</group>
 
@@ -168 +172 @@
   //#Data
   // Max length allowed of list
-  uInt nmax_p;
+  casacore::uInt nmax_p;
   // List of elements
-  PtrBlock<SpectralElement *> list_p;
+  casacore::PtrBlock<SpectralElement *> list_p;
 
   //# Member functions
   // Compare two elements
-  Int compar(const SpectralElement &p1, const SpectralElement &p2) const;
+  casacore::Int compar(const SpectralElement &p1, const SpectralElement &p2) const;
 
 };