Changeset 3034 for trunk


Ignore:
Timestamp:
04/01/15 10:35:15 (10 years ago)
Author:
Malte Marquarding
Message:

Remove reference to libpryap (scons). use casacore_python from now on

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/SConstruct

    r3031 r3034  
    111111            Exit(1)
    112112
    113     if env["enable_pyrap"]:
    114         conf.env.AddCustomPackage('pyrap')
    115         if conf.CheckLib(conf.env["pyraplib"], language='c++', autoadd=0):
    116             conf.env.PrependUnique(LIBS=env['pyraplib'])
    117         else:
    118             Exit(1)
    119     else:
    120         conf.env.AppendUnique(CPPPATH=[conf.env["numpyincdir"]])
    121         if conf.CheckHeader("numpy/numpyconfig.h"):
    122             conf.env.Append(CPPDEFINES=["-DAIPS_USENUMPY"])
    123         else:
    124             conf.env.Exit(1)
    125         # compile in pyrap from here...
    126         conf.env["pyrapint"] = "#/external/libpyrap/pyrap-0.3.2"
    127     conf.env.Append(CPPFLAGS=['-DHAVE_LIBPYRAP'])
    128 
    129113    if not conf.CheckLib("m"):
    130114        Exit(1)
    … …  
    163147            conf.env.AppendUnique(CPPPATH=[pth,pth+'/..'])
    164148            break
    165     cclibs = ["casa_images", "casa_ms", #"casa_components",
     149    cclibs = ["casa_python", "casa_images", "casa_ms",
    166150              "casa_coordinates", "casa_lattices",
    167151              "casa_fits", "casa_measures", "casa_scimath",

  • trunk/external-alma/SConscript

    r2980 r3034  
    66sources += glob.glob("atnf/pks/pks_maths.cc")
    77
    8 #sources2 = glob.glob("components/SpectralComponents/*.cc")
     8sources2 = glob.glob("components/SpectralComponents/*.cc")
    99
    1010env.AppendUnique(CPPPATH=[Dir(".").abspath])
    1111atnflib=env.Library("atnf", sources)
    12 #complib=env.Library("oldcomponents", sources2)
     12complib=env.Library("oldcomponents", sources2)
    1313env.AppendUnique(LIBPATH=[Dir(".").abspath])
    14 env.Prepend(LIBS=["atnf"])#,"oldcomponents"])
     14env.Prepend(LIBS=["atnf","oldcomponents"])

  • trunk/external/libpyrap

    • Property svn:externals deleted

  • trunk/src/python_asap.cpp

    r3029 r3034  
    4040#include "ScantableWrapper.h"
    4141
    42 #ifndef HAVE_LIBPYRAP
    43   #include "pyconversions.h"
    44 #else
    45   #include <pyrap/Converters/PycExcp.h>
    46   #include <pyrap/Converters/PycBasicData.h>
    47   #include <pyrap/Converters/PycValueHolder.h>
    48   #include <pyrap/Converters/PycRecord.h>
    49 #endif
     42#include <casacore/python/Converters/PycExcp.h>
     43#include <casacore/python/Converters/PycBasicData.h>
     44#include <casacore/python/Converters/PycValueHolder.h>
     45#include <casacore/python/Converters/PycRecord.h>
     46
    5047
    5148#include "python_asap.h"
    5249
    53 #ifndef HAVE_LIBPYRAP
    5450namespace asap {
    5551  namespace python {
    … …  
    6359  }
    6460}
    65 #endif
    6661
    6762using namespace boost::python;
    … …  
    9489  asap::python::python_CalibrationManager();
    9590
    96 #ifndef HAVE_LIBPYRAP
    97   // Use built-in pyconversions.h
    98   register_exception_translator<casa::AipsError>(&asap::python::translate_ex);
    99   from_python_sequence < std::vector< asap::ScantableWrapper >,
    100     variable_capacity_policy > ();
    101   std_vector_to_tuple < int > ();
    102   from_python_sequence < std::vector < int >,
    103     variable_capacity_policy > ();
    104   std_vector_to_tuple < uint > ();
    105   from_python_sequence < std::vector < uint >,
    106     variable_capacity_policy > ();
    107   std_vector_to_tuple < float > ();
    108   from_python_sequence < std::vector < float >,
    109     variable_capacity_policy > ();
    110   std_vector_to_tuple < double > ();
    111   from_python_sequence < std::vector < double >,
    112     variable_capacity_policy > ();
    113   std_vector_to_tuple < std::string > ();
    114   from_python_sequence < std::vector < std::string >,
    115     variable_capacity_policy > ();
    116   std_vector_to_tuple < bool> ();
    117   from_python_sequence < std::vector < bool >,
    118     variable_capacity_policy > ();
    119 #else
    120   casa::pyrap::register_convert_excp();
    121   casa::pyrap::register_convert_basicdata();
    122   casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>();
    123   casa::pyrap::register_convert_std_vector<int>();
    124   casa::pyrap::register_convert_std_vector<uint>();
    125   casa::pyrap::register_convert_std_vector<float>();
    126   casa::pyrap::register_convert_std_vector<double>();
    127   casa::pyrap::register_convert_std_vector<std::string>();
     91  casacore::python::register_convert_excp();
     92  casacore::python::register_convert_basicdata();
     93  casacore::python::register_convert_std_vector<asap::ScantableWrapper>();
     94  casacore::python::register_convert_std_vector<int>();
     95  casacore::python::register_convert_std_vector<uint>();
     96  casacore::python::register_convert_std_vector<float>();
     97  casacore::python::register_convert_std_vector<double>();
     98  casacore::python::register_convert_std_vector<std::string>();
    12899//////////////see error below//////////////////////////////
    129   casa::pyrap::register_convert_std_vector<bool>();
     100  casacore::python::register_convert_std_vector<bool>();
    130101///////////////////////////////////////////////////////////
    131   casa::pyrap::register_convert_casa_valueholder();
    132   casa::pyrap::register_convert_casa_record();
    133 
    134 #endif
     102  casacore::python::register_convert_casa_valueholder();
     103  casacore::python::register_convert_casa_record();
     104
    135105}
    136106//[ 79%] Building CXX object src/CMakeFiles/_asap.dir/python_asap.cpp.o
    137 //cd ...trunk/asap/build/src && /usr/bin/clang++   -DAIPS_AUTO_STL -DAIPS_DEBUG -DAIPS_STDLIB -DCASACORE_NEEDS_RETHROW -DCASA_USECASAPATH -DENABLE_PLOTTER2 -DHAVE_LIBPYRAP -DNOPKSMS -DUSE_CASAPY -DWITHOUT_ACS -D_GNU_SOURCE -D_asap_EXPORTS -pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment -ggdb3 -O0 -fno-omit-frame-pointer -fPIC -I...trunk/darwin/include/casacore -I...trunk/darwin/include/casacore/.. -I/opt/casa/01/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include -I...trunk/asap/src -I...trunk/asap/external-alma -I...trunk/asap/external/libpyrap/pyrap-0.3.2    -o CMakeFiles/_asap.dir/python_asap.cpp.o -c ...trunk/asap/src/python_asap.cpp
     107//cd ...trunk/asap/build/src && /usr/bin/clang++   -DAIPS_AUTO_STL -DAIPS_DEBUG -DAIPS_STDLIB -DCASACORE_NEEDS_RETHROW -DCASA_USECASAPATH -DENABLE_PLOTTER2 -DHAVE_LIBPYTHON -DNOPKSMS -DUSE_CASAPY -DWITHOUT_ACS -D_GNU_SOURCE -D_asap_EXPORTS -pipe -Wall -Wextra -Wno-non-template-friend -Wcast-align -Wno-comment -ggdb3 -O0 -fno-omit-frame-pointer -fPIC -I...trunk/darwin/include/casacore -I...trunk/darwin/include/casacore/.. -I/opt/casa/01/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/include -I/opt/casa/01/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include -I...trunk/asap/src -I...trunk/asap/external-alma -I...trunk/asap/external/libpython/python-0.3.2    -o CMakeFiles/_asap.dir/python_asap.cpp.o -c ...trunk/asap/src/python_asap.cpp
    138108//warning: unknown warning option '-Wno-non-template-friend'; did you mean '-Wno-unsupported-friend'? [-Wunknown-warning-option]
    139109//In file included from ...trunk/asap/src/python_asap.cpp:32:
    … …  
    155125//                             ^
    156126//In file included from ...trunk/asap/src/python_asap.cpp:46:
    157 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:95:9: warning: cast from
     127//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:95:9: warning: cast from
    158128//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'boost::python::converter::rvalue_from_python_storage<String> *' increases required alignment
    159129//      from 8 to 16 [-Wcast-align]
    160130//        (boost::python::converter::rvalue_from_python_storage<String>*)
    161131//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    162 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     132//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    163133//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<asap::ScantableWrapper,
    164134//      std::__1::allocator<asap::ScantableWrapper> > > *' increases required alignment from 8 to 16 [-Wcast-align]
    165135//        (rvalue_from_python_storage<ContainerType>*)
    166136//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    167 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    168 //      'casa::pyrap::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
    169 //      casa::pyrap::stl_variable_capacity_policy>::construct' requested here
    170 //        &construct,
    171 //         ^
    172 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    173 //      'casa::pyrap::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
    174 //      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
    175 //        from_python_sequence < std::vector < T >,
    176 //        ^
    177 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    178 //      'casa::pyrap::convert_std_vector<asap::ScantableWrapper>::reg' requested here
     137//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     138//      'casacore::python::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
     139//      casacore::python::stl_variable_capacity_policy>::construct' requested here
     140//        &construct,
     141//         ^
     142//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     143//      'casacore::python::from_python_sequence<std::__1::vector<asap::ScantableWrapper, std::__1::allocator<asap::ScantableWrapper> >,
     144//      casacore::python::stl_variable_capacity_policy>::from_python_sequence' requested here
     145//        from_python_sequence < std::vector < T >,
     146//        ^
     147//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     148//      'casacore::python::convert_std_vector<asap::ScantableWrapper>::reg' requested here
    179149//    { convert_std_vector<T>::reg(); }
    180150//                             ^
    181151//...trunk/asap/src/python_asap.cpp:122:16: note: in instantiation of function template specialization
    182 //      'casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>' requested here
    183 //  casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>();
    184 //               ^
    185 //In file included from ...trunk/asap/src/python_asap.cpp:46:
    186 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     152//      'casacore::python::register_convert_std_vector<asap::ScantableWrapper>' requested here
     153//  casacore::python::register_convert_std_vector<asap::ScantableWrapper>();
     154//               ^
     155//In file included from ...trunk/asap/src/python_asap.cpp:46:
     156//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    187157//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<int, std::__1::allocator<int> > > *' increases
    188158//      required alignment from 8 to 16 [-Wcast-align]
    189159//        (rvalue_from_python_storage<ContainerType>*)
    190160//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    191 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    192 //      'casa::pyrap::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
    193 //        &construct,
    194 //         ^
    195 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    196 //      'casa::pyrap::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
    197 //      requested here
    198 //        from_python_sequence < std::vector < T >,
    199 //        ^
    200 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    201 //      'casa::pyrap::convert_std_vector<int>::reg' requested here
     161//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     162//      'casacore::python::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casacore::python::stl_variable_capacity_policy>::construct' requested here
     163//        &construct,
     164//         ^
     165//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     166//      'casacore::python::from_python_sequence<std::__1::vector<int, std::__1::allocator<int> >, casacore::python::stl_variable_capacity_policy>::from_python_sequence'
     167//      requested here
     168//        from_python_sequence < std::vector < T >,
     169//        ^
     170//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     171//      'casacore::python::convert_std_vector<int>::reg' requested here
    202172//    { convert_std_vector<T>::reg(); }
    203173//                             ^
    204174//...trunk/asap/src/python_asap.cpp:123:16: note: in instantiation of function template specialization
    205 //      'casa::pyrap::register_convert_std_vector<int>' requested here
    206 //  casa::pyrap::register_convert_std_vector<int>();
    207 //               ^
    208 //In file included from ...trunk/asap/src/python_asap.cpp:46:
    209 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     175//      'casacore::python::register_convert_std_vector<int>' requested here
     176//  casacore::python::register_convert_std_vector<int>();
     177//               ^
     178//In file included from ...trunk/asap/src/python_asap.cpp:46:
     179//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    210180//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >
    211181//      > *' increases required alignment from 8 to 16 [-Wcast-align]
    212182//        (rvalue_from_python_storage<ContainerType>*)
    213183//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    214 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    215 //      'casa::pyrap::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >, casa::pyrap::stl_variable_capacity_policy>::construct'
    216 //      requested here
    217 //        &construct,
    218 //         ^
    219 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    220 //      'casa::pyrap::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >,
    221 //      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
    222 //        from_python_sequence < std::vector < T >,
    223 //        ^
    224 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    225 //      'casa::pyrap::convert_std_vector<unsigned int>::reg' requested here
     184//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     185//      'casacore::python::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >, casacore::python::stl_variable_capacity_policy>::construct'
     186//      requested here
     187//        &construct,
     188//         ^
     189//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     190//      'casacore::python::from_python_sequence<std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >,
     191//      casacore::python::stl_variable_capacity_policy>::from_python_sequence' requested here
     192//        from_python_sequence < std::vector < T >,
     193//        ^
     194//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     195//      'casacore::python::convert_std_vector<unsigned int>::reg' requested here
    226196//    { convert_std_vector<T>::reg(); }
    227197//                             ^
    228198//...trunk/asap/src/python_asap.cpp:124:16: note: in instantiation of function template specialization
    229 //      'casa::pyrap::register_convert_std_vector<unsigned int>' requested here
    230 //  casa::pyrap::register_convert_std_vector<uint>();
    231 //               ^
    232 //In file included from ...trunk/asap/src/python_asap.cpp:46:
    233 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     199//      'casacore::python::register_convert_std_vector<unsigned int>' requested here
     200//  casacore::python::register_convert_std_vector<uint>();
     201//               ^
     202//In file included from ...trunk/asap/src/python_asap.cpp:46:
     203//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    234204//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<float, std::__1::allocator<float> > > *'
    235205//      increases required alignment from 8 to 16 [-Wcast-align]
    236206//        (rvalue_from_python_storage<ContainerType>*)
    237207//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    238 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    239 //      'casa::pyrap::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
    240 //        &construct,
    241 //         ^
    242 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    243 //      'casa::pyrap::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
    244 //      requested here
    245 //        from_python_sequence < std::vector < T >,
    246 //        ^
    247 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    248 //      'casa::pyrap::convert_std_vector<float>::reg' requested here
     208//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     209//      'casacore::python::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casacore::python::stl_variable_capacity_policy>::construct' requested here
     210//        &construct,
     211//         ^
     212//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     213//      'casacore::python::from_python_sequence<std::__1::vector<float, std::__1::allocator<float> >, casacore::python::stl_variable_capacity_policy>::from_python_sequence'
     214//      requested here
     215//        from_python_sequence < std::vector < T >,
     216//        ^
     217//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     218//      'casacore::python::convert_std_vector<float>::reg' requested here
    249219//    { convert_std_vector<T>::reg(); }
    250220//                             ^
    251221//...trunk/asap/src/python_asap.cpp:125:16: note: in instantiation of function template specialization
    252 //      'casa::pyrap::register_convert_std_vector<float>' requested here
    253 //  casa::pyrap::register_convert_std_vector<float>();
    254 //               ^
    255 //In file included from ...trunk/asap/src/python_asap.cpp:46:
    256 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     222//      'casacore::python::register_convert_std_vector<float>' requested here
     223//  casacore::python::register_convert_std_vector<float>();
     224//               ^
     225//In file included from ...trunk/asap/src/python_asap.cpp:46:
     226//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    257227//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<double, std::__1::allocator<double> > > *'
    258228//      increases required alignment from 8 to 16 [-Wcast-align]
    259229//        (rvalue_from_python_storage<ContainerType>*)
    260230//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    261 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    262 //      'casa::pyrap::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested
     231//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     232//      'casacore::python::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casacore::python::stl_variable_capacity_policy>::construct' requested
    263233//      here
    264234//        &construct,
    265235//         ^
    266 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    267 //      'casa::pyrap::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
    268 //      requested here
    269 //        from_python_sequence < std::vector < T >,
    270 //        ^
    271 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    272 //      'casa::pyrap::convert_std_vector<double>::reg' requested here
     236//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     237//      'casacore::python::from_python_sequence<std::__1::vector<double, std::__1::allocator<double> >, casacore::python::stl_variable_capacity_policy>::from_python_sequence'
     238//      requested here
     239//        from_python_sequence < std::vector < T >,
     240//        ^
     241//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     242//      'casacore::python::convert_std_vector<double>::reg' requested here
    273243//    { convert_std_vector<T>::reg(); }
    274244//                             ^
    275245//...trunk/asap/src/python_asap.cpp:126:16: note: in instantiation of function template specialization
    276 //      'casa::pyrap::register_convert_std_vector<double>' requested here
    277 //  casa::pyrap::register_convert_std_vector<double>();
    278 //               ^
    279 //In file included from ...trunk/asap/src/python_asap.cpp:46:
    280 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     246//      'casacore::python::register_convert_std_vector<double>' requested here
     247//  casacore::python::register_convert_std_vector<double>();
     248//               ^
     249//In file included from ...trunk/asap/src/python_asap.cpp:46:
     250//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    281251//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<std::__1::basic_string<char>,
    282252//      std::__1::allocator<std::__1::basic_string<char> > > > *' increases required alignment from 8 to 16 [-Wcast-align]
    283253//        (rvalue_from_python_storage<ContainerType>*)
    284254//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    285 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    286 //      'casa::pyrap::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
    287 //      casa::pyrap::stl_variable_capacity_policy>::construct' requested here
    288 //        &construct,
    289 //         ^
    290 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    291 //      'casa::pyrap::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
    292 //      casa::pyrap::stl_variable_capacity_policy>::from_python_sequence' requested here
    293 //        from_python_sequence < std::vector < T >,
    294 //        ^
    295 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    296 //      'casa::pyrap::convert_std_vector<std::__1::basic_string<char> >::reg' requested here
     255//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     256//      'casacore::python::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
     257//      casacore::python::stl_variable_capacity_policy>::construct' requested here
     258//        &construct,
     259//         ^
     260//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     261//      'casacore::python::from_python_sequence<std::__1::vector<std::__1::basic_string<char>, std::__1::allocator<std::__1::basic_string<char> > >,
     262//      casacore::python::stl_variable_capacity_policy>::from_python_sequence' requested here
     263//        from_python_sequence < std::vector < T >,
     264//        ^
     265//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     266//      'casacore::python::convert_std_vector<std::__1::basic_string<char> >::reg' requested here
    297267//    { convert_std_vector<T>::reg(); }
    298268//                             ^
    299269//...trunk/asap/src/python_asap.cpp:127:16: note: in instantiation of function template specialization
    300 //      'casa::pyrap::register_convert_std_vector<std::__1::basic_string<char> >' requested here
    301 //  casa::pyrap::register_convert_std_vector<std::string>();
     270//      'casacore::python::register_convert_std_vector<std::__1::basic_string<char> >' requested here
     271//  casacore::python::register_convert_std_vector<std::string>();
    302272//               ^
    303273//In file included from ...trunk/asap/src/python_asap.cpp:32:
    … …  
    332302//        base::append(object(x));
    333303//                     ^
    334 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:219:9: note: (skipping 3 contexts in backtrace; use
     304//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:219:9: note: (skipping 3 contexts in backtrace; use
    335305//      -ftemplate-backtrace-limit=0 to see all)
    336306//        result.append(*i);
    337307//               ^
    338308///opt/casa/01/include/boost/python/to_python_converter.hpp:88:22: note: in instantiation of member function
    339 //      'boost::python::converter::as_to_python_function<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::to_list<std::__1::vector<bool,
     309//      'boost::python::converter::as_to_python_function<std::__1::vector<bool, std::__1::allocator<bool> >, casacore::python::to_list<std::__1::vector<bool,
    340310//      std::__1::allocator<bool> > > >::convert' requested here
    341311//        &normalized::convert
    342312//                     ^
    343 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:317:7: note: in instantiation of member function
    344 //      'boost::python::to_python_converter<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::to_list<std::__1::vector<bool, std::__1::allocator<bool>
     313//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:317:7: note: in instantiation of member function
     314//      'boost::python::to_python_converter<std::__1::vector<bool, std::__1::allocator<bool> >, casacore::python::to_list<std::__1::vector<bool, std::__1::allocator<bool>
    345315//      > >, false>::to_python_converter' requested here
    346316//      boost::python::to_python_converter < std::vector < T >,
    347317//      ^
    348 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:542:2: note: in instantiation of member function
    349 //      'casa::pyrap::std_vector_to_list<bool>::std_vector_to_list' requested here
     318//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:542:2: note: in instantiation of member function
     319//      'casacore::python::std_vector_to_list<bool>::std_vector_to_list' requested here
    350320//        std_vector_to_list < T > ();
    351321//        ^
    352 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    353 //      'casa::pyrap::convert_std_vector<bool>::reg' requested here
     322//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     323//      'casacore::python::convert_std_vector<bool>::reg' requested here
    354324//    { convert_std_vector<T>::reg(); }
    355325//                             ^
    356326//...trunk/asap/src/python_asap.cpp:128:16: note: in instantiation of function template specialization
    357 //      'casa::pyrap::register_convert_std_vector<bool>' requested here
    358 //  casa::pyrap::register_convert_std_vector<bool>();
     327//      'casacore::python::register_convert_std_vector<bool>' requested here
     328//  casacore::python::register_convert_std_vector<bool>();
    359329//               ^
    360330///opt/casa/01/include/boost/python/converter/arg_to_python_base.hpp:20:7: note: candidate constructor not viable: no known conversion from
    … …  
    367337//                           ^
    368338//In file included from ...trunk/asap/src/python_asap.cpp:46:
    369 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:424:9: warning: cast from
     339//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:424:9: warning: cast from
    370340//      'boost::python::converter::rvalue_from_python_stage1_data *' to 'rvalue_from_python_storage<std::__1::vector<bool, std::__1::allocator<bool> > > *' increases
    371341//      required alignment from 8 to 16 [-Wcast-align]
    372342//        (rvalue_from_python_storage<ContainerType>*)
    373343//        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    374 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:367:10: note: in instantiation of member function
    375 //      'casa::pyrap::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::stl_variable_capacity_policy>::construct' requested here
    376 //        &construct,
    377 //         ^
    378 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:543:2: note: in instantiation of member function
    379 //      'casa::pyrap::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casa::pyrap::stl_variable_capacity_policy>::from_python_sequence'
    380 //      requested here
    381 //        from_python_sequence < std::vector < T >,
    382 //        ^
    383 //...trunk/asap/external/libpyrap/pyrap-0.3.2/pyrap/Converters/PycBasicData.h:550:30: note: in instantiation of member function
    384 //      'casa::pyrap::convert_std_vector<bool>::reg' requested here
     344//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:367:10: note: in instantiation of member function
     345//      'casacore::python::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casacore::python::stl_variable_capacity_policy>::construct' requested here
     346//        &construct,
     347//         ^
     348//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:543:2: note: in instantiation of member function
     349//      'casacore::python::from_python_sequence<std::__1::vector<bool, std::__1::allocator<bool> >, casacore::python::stl_variable_capacity_policy>::from_python_sequence'
     350//      requested here
     351//        from_python_sequence < std::vector < T >,
     352//        ^
     353//...trunk/asap/external/libpython/python-0.3.2/python/Converters/PycBasicData.h:550:30: note: in instantiation of member function
     354//      'casacore::python::convert_std_vector<bool>::reg' requested here
    385355//    { convert_std_vector<T>::reg(); }
    386356//                             ^
    387357//...trunk/asap/src/python_asap.cpp:128:16: note: in instantiation of function template specialization
    388 //      'casa::pyrap::register_convert_std_vector<bool>' requested here
    389 //  casa::pyrap::register_convert_std_vector<bool>();
     358//      'casacore::python::register_convert_std_vector<bool>' requested here
     359//  casacore::python::register_convert_std_vector<bool>();
    390360//               ^
    391361//12 warnings and 1 error generated.
Note: See TracChangeset for help on using the changeset viewer.