Changeset 3085 for trunk


Ignore:
Timestamp:
11/25/15 17:35:48 (9 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

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...


Reorder include files to suppress compiler warning related with _XOPEN_SOURCE redefinition.

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/CalibrationManager.cpp

    r3037 r3085  
    1010//
    1111//
     12
     13// ASAP
     14#include "CalibrationManager.h"
     15#include "Scantable.h"
     16#include "STCalTsys.h"
     17#include "STCalSkyPSAlma.h"
     18#include "STCalSkyOtfAlma.h"
     19
    1220#include <assert.h>
    1321
    … …  
    2129#include <measures/TableMeasures/ScalarMeasColumn.h>
    2230
    23 
    24 #include "CalibrationManager.h"
    25 #include "Scantable.h"
    26 #include "STCalTsys.h"
    27 #include "STCalSkyPSAlma.h"
    28 #include "STCalSkyOtfAlma.h"
    2931
    3032using namespace casa;

  • trunk/src/CalibrationManager.h

    r2923 r3085  
    1313#define ASAP_CALIBRATION_MANAGER_H
    1414
     15// ASAP
     16// ScantableWrapper.h must be included first to avoid compiler warnings
     17// related with _XOPEN_SOURCE
     18#include "ScantableWrapper.h"
     19#include "STApplyCal.h"
     20#include "STCalTsys.h"
     21#include "STCalibration.h"
     22#include "STCalEnum.h"
     23
    1524#include <string>
    1625#include <vector>
    … …  
    2130#include <casa/Utilities/CountedPtr.h>
    2231#include <casa/Logging/LogIO.h>
    23 
    24 #include "ScantableWrapper.h"
    25 #include "STApplyCal.h"
    26 #include "STCalTsys.h"
    27 #include "STCalibration.h"
    28 #include "STCalEnum.h"
    2932
    3033namespace asap {

  • trunk/src/PlotHelper.cpp

    r2951 r3085  
    1010//
    1111//
     12
     13// ASAP
     14#include "PlotHelper.h"
    1215
    1316// casacore
    … …  
    2124#include <tables/Tables/TableRecord.h>
    2225
    23 
    24 #include "PlotHelper.h"
    2526
    2627#define SMALL_ANGLE 1.0e-7

  • trunk/src/PlotHelper.h

    r2719 r3085  
    1313#define ASAPPLOTHELPER_H
    1414
     15// ASAP
     16// ScantableWrapper.h must be included first to avoid compiler warnings
     17// related with _XOPEN_SOURCE
     18#include "ScantableWrapper.h"
     19#include "Scantable.h"
     20
    1521// STL
    1622#include <iostream>
    … …  
    2127#include <casa/Utilities/CountedPtr.h>
    2228#include <coordinates/Coordinates/DirectionCoordinate.h>
    23 
    24 #include "ScantableWrapper.h"
    25 #include "Scantable.h"
    2629
    2730namespace asap {

  • trunk/src/STGrid.cpp

    r3084 r3085  
    1010//
    1111//
     12
     13// ASAP
     14// STGrid must be included first to avoid compiler warning related
     15// with _XOPEN_SOURCE
     16#include "STGrid.h"
     17#include "MathUtils.h"
     18#include <atnf/PKSIO/SrcType.h>
     19
    1220#include <casa/BasicSL/String.h>
    1321#include <casa/Arrays/Vector.h>
    … …  
    2937
    3038#include <measures/Measures/MDirection.h>
    31 
    32 #include "MathUtils.h"
    33 #include <atnf/PKSIO/SrcType.h>
    34 
    35 #include "STGrid.h"
    3639
    3740using namespace std ;

  • trunk/src/STGrid.h

    r2851 r3085  
    1212#ifndef ASAPSTGRID_H
    1313#define ASAPSTGRID_H
     14
     15// ASAP
     16// ScantableWrapper.h must be included first to avoid compiler warnings
     17// related with _XOPEN_SOURCE
     18#include "ScantableWrapper.h"
     19#include "Scantable.h"
     20#include "concurrent.h"
    1421
    1522#include <iostream>
    … …  
    2936
    3037#include <coordinates/Coordinates/DirectionCoordinate.h>
    31 
    32 #include "ScantableWrapper.h"
    33 #include "Scantable.h"
    34 #include "concurrent.h"
    3538
    3639using namespace std ;

  • trunk/src/STLineFinder.cpp

    r3029 r3085  
    3030//#---------------------------------------------------------------------------
    3131
    32 
    3332// ASAP
    3433#include "STLineFinder.h"

  • trunk/src/STLineFinder.h

    r3029 r3085  
    3232#define STLINEFINDER_H
    3333
     34// ASAP
     35#include "ScantableWrapper.h"
     36#include "Scantable.h"
     37
    3438// STL
    3539#include <vector>
    … …  
    4448#include <casa/Utilities/Assert.h>
    4549#include <casa/Utilities/CountedPtr.h>
    46 
    47 // ASAP
    48 #include "ScantableWrapper.h"
    49 #include "Scantable.h"
    5050
    5151namespace asap {

  • trunk/src/STSideBandSep.cpp

    r2985 r3085  
    1010//
    1111
    12 // STL
    13 #include <ctype.h>
    14 
    15 // cascore
    16 #include <casa/OS/File.h>
    17 #include <casa/Logging/LogIO.h>
    18 #include <casa/Quanta/QuantumHolder.h>
    19 
    20 #include <measures/Measures/MFrequency.h>
    21 #include <measures/Measures/MCFrequency.h>
    22 
    23 #include <tables/Tables/TableRow.h>
    24 #include <tables/Tables/TableRecord.h>
    25 #include <tables/Tables/TableVector.h>
    26 
    2712// asap
    2813#include "STGrid.h"
    … …  
    3015#include "MathUtils.h"
    3116#include "STSideBandSep.h"
     17
     18// STL
     19#include <ctype.h>
     20
     21// cascore
     22#include <casa/OS/File.h>
     23#include <casa/Logging/LogIO.h>
     24#include <casa/Quanta/QuantumHolder.h>
     25
     26#include <measures/Measures/MFrequency.h>
     27#include <measures/Measures/MCFrequency.h>
     28
     29#include <tables/Tables/TableRow.h>
     30#include <tables/Tables/TableRecord.h>
     31#include <tables/Tables/TableVector.h>
    3232
    3333using namespace std ;

  • trunk/src/Scantable.cpp

    r3084 r3085  
    1010//
    1111//
     12
     13// ASAP
     14// STLineFinder must be included first to avoid compiler warnings related with _XOPEN_SOURCE
     15#include "STLineFinder.h"
     16#include "MathUtils.h"
     17#include "STAttr.h"
     18#include "STBaselineTable.h"
     19#include "STPolCircular.h"
     20#include "STPolLinear.h"
     21#include "STPolStokes.h"
     22#include "STUpgrade.h"
     23#include "STFitter.h"
     24#include "Scantable.h"
     25
    1226#include <map>
    1327#include <sys/time.h>
    … …  
    6579#include <tables/Tables/TableRow.h>
    6680#include <tables/Tables/TableVector.h>
    67 
    68 #include "MathUtils.h"
    69 #include "STAttr.h"
    70 #include "STBaselineTable.h"
    71 #include "STLineFinder.h"
    72 #include "STPolCircular.h"
    73 #include "STPolLinear.h"
    74 #include "STPolStokes.h"
    75 #include "STUpgrade.h"
    76 #include "STFitter.h"
    77 #include "Scantable.h"
    7881
    7982#define debug 1

  • trunk/src/ScantableWrapper.h

    r3052 r3085  
    1313#define ASAPSCANTABLEWRAPPER_H
    1414
    15 #include <iostream>
    16 #include <string>
    17 #include <vector>
    18 
    19 #include <casa/Arrays/Vector.h>
    20 
     15#include "GILHandler.h"
    2116#include "MathUtils.h"
    2217#include "Scantable.h"
    … …  
    2419#include "STFit.h"
    2520#include "STFitEntry.h"
    26 #include "GILHandler.h"
     21
     22#include <iostream>
     23#include <string>
     24#include <vector>
     25
     26#include <casa/Arrays/Vector.h>
    2727
    2828namespace asap {
Note: See TracChangeset for help on using the changeset viewer.