Changeset 2526 for trunk


Ignore:
Timestamp:
05/16/12 09:33:55 (13 years ago)
Author:
Malte Marquarding
Message:

OS X 10.7 gcc fails when stl's are included before boost

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/python_LineCatalog.cpp

    r1156 r2526  
    1010//
    1111//
    12 
     12#include <boost/python.hpp>
    1313#include <string>
    14 
    15 #include <boost/python.hpp>
    1614
    1715#include "LineCatalog.h"

  • trunk/src/python_STGrid.cpp

    r2396 r2526  
    22//# python_STGrid.cc: python exposure of c++ STGrid class
    33//#---------------------------------------------------------------------------
     4#include <boost/python.hpp>
     5#include <boost/python/args.hpp>
     6
    47#include <string>
    58#include <vector>
    6 
    7 #include <boost/python.hpp>
    8 #include <boost/python/args.hpp>
    99
    1010#include "STGrid.h"

  • trunk/src/python_STMath.cpp

    r2177 r2526  
    22//# python_STMathWrapper.cc: python exposure of c++ STMath class
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2004
     4//# Copyright (C) 2004-2012
    55//# ATNF
    66//#
    … …  
    2929//# $Id$
    3030//#---------------------------------------------------------------------------
     31#include <boost/python.hpp>
     32
    3133#include <vector>
    32 #include <boost/python.hpp>
    3334
    3435#include "STMathWrapper.h"

  • trunk/src/python_Scantable.cpp

    r2435 r2526  
    22//# python_Scantable.cc: python exposure of c++ Scantable class
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2004
     4//# Copyright (C) 2004-2012
    55//# ATNF
    66//#
    … …  
    2929//# $Id$
    3030//#---------------------------------------------------------------------------
    31 #include <vector>
    3231
    3332#include <boost/python.hpp>
    3433#include <boost/python/args.hpp>
     34#include <vector>
    3535
    3636#include "ScantableWrapper.h"

  • trunk/src/python_SrcType.cpp

    r2313 r2526  
    22//# python_SrcType.cc: python exposure of c++ atnf/PKSIO/SrcType class
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2004
     4//# Copyright (C) 2004-2012
    55//# ATNF
    66//#
    … …  
    2929//# $Id: python_SrcType.cpp 1677 2010-01-27 07:29:48Z TakeshiNakazato $
    3030//#---------------------------------------------------------------------------
    31 #include <vector>
    3231#include <boost/python.hpp>
    3332#include <boost/python/enum.hpp>
     33
     34#include <vector>
    3435
    3536#include <atnf/PKSIO/SrcType.h>

  • trunk/src/python_asap.cpp

    r2356 r2526  
    22//# python_asap.cc: python module for single dish package asap
    33//#---------------------------------------------------------------------------
    4 //# Copyright (C) 2004
     4//# Copyright (C) 2004-2012
    55//# ATNF
    66//#
    … …  
    2929//# $Id$
    3030//#---------------------------------------------------------------------------
    31 #include <string>
    32 #include <vector>
    3331
    3432#include <boost/python.hpp>
    3533#include <boost/python/exception_translator.hpp>
     34
     35#include <string>
     36#include <vector>
    3637
    3738#include <casa/aips.h>
Note: See TracChangeset for help on using the changeset viewer.