boost-python.patch

   1 --- boost-1.30.2/boost/python/converter/builtin_converters.hpp.orig     2002-12-16 05:01:50.000000000 +0100
   2 +++ boost-1.30.2/boost/python/converter/builtin_converters.hpp  2004-02-07 21:14:38.015285552 +0100
   3 @@ -103,8 +103,8 @@
   4  // using Python's macro instead of Boost's - we don't seem to get the
   5  // config right all the time.
   6  # ifdef HAVE_LONG_LONG
   7 -BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed LONG_LONG, PyLong_FromLongLong(x))
   8 -BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned LONG_LONG, PyLong_FromUnsignedLongLong(x))
   9 +BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed long long, PyLong_FromLongLong(x))
  10 +BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned long long, PyLong_FromUnsignedLongLong(x))
  11  # endif
  12
  13  # undef BOOST_TO_PYTHON_INT
  14 --- boost-1.30.2/libs/python/src/converter/builtin_converters.cpp.orig  2003-03-08 06:28:54.000000000 +0100
  15 +++ boost-1.30.2/libs/python/src/converter/builtin_converters.cpp       2004-02-07 21:14:11.250354440 +0100
  16 @@ -171,7 +171,7 @@
  17
  18    struct long_long_rvalue_from_python : long_long_rvalue_from_python_base
  19    {
  20 -      static LONG_LONG extract(PyObject* intermediate)
  21 +      static long long extract(PyObject* intermediate)
  22        {
  23            if (PyInt_Check(intermediate))
  24            {
  25 @@ -179,7 +179,7 @@
  26            }
  27            else
  28            {
  29 -              LONG_LONG result = PyLong_AsLongLong(intermediate);
  30 +              long long result = PyLong_AsLongLong(intermediate);
  31
  32                if (PyErr_Occurred())
  33                    throw_error_already_set();
  34 @@ -191,15 +191,15 @@
  35
  36    struct unsigned_long_long_rvalue_from_python : long_long_rvalue_from_python_base
  37    {
  38 -      static unsigned LONG_LONG extract(PyObject* intermediate)
  39 +      static unsigned long long extract(PyObject* intermediate)
  40        {
  41            if (PyInt_Check(intermediate))
  42            {
  43 -              return numeric_cast<unsigned LONG_LONG>(PyInt_AS_LONG(intermediate));
  44 +              return numeric_cast<unsigned long long>(PyInt_AS_LONG(intermediate));
  45            }
  46            else
  47            {
  48 -              unsigned LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);
  49 +              unsigned long long result = PyLong_AsUnsignedLongLong(intermediate);
  50
  51                if (PyErr_Occurred())
  52                    throw_error_already_set();
  53 @@ -350,8 +350,8 @@
  54  // using Python's macro instead of Boost's - we don't seem to get the
  55  // config right all the time.
  56  # ifdef HAVE_LONG_LONG
  57 -    slot_rvalue_from_python<signed LONG_LONG,long_long_rvalue_from_python>();
  58 -    slot_rvalue_from_python<unsigned LONG_LONG,unsigned_long_long_rvalue_from_python>();
  59 +    slot_rvalue_from_python<signed long long,long_long_rvalue_from_python>();
  60 +    slot_rvalue_from_python<unsigned long long,unsigned_long_long_rvalue_from_python>();
  61  # endif
  62
  63      // floating types
  64 --- boost-1.30.2/libs/python/test/test_builtin_converters.cpp.orig      2003-03-10 18:25:52.000000000 +0100
  65 +++ boost-1.30.2/libs/python/test/test_builtin_converters.cpp   2004-02-07 21:13:28.109912784 +0100
  66 @@ -75,8 +75,8 @@
  67  // using Python's macro instead of Boost's - we don't seem to get the
  68  // config right all the time.
  69  #ifdef HAVE_LONG_LONG
  70 -    def("rewrap_value_long_long", by_value<LONG_LONG>::rewrap);
  71 -    def("rewrap_value_unsigned_long_long", by_value<unsigned LONG_LONG>::rewrap);
  72 +    def("rewrap_value_long_long", by_value<long long>::rewrap);
  73 +    def("rewrap_value_unsigned_long_long", by_value<unsigned long long>::rewrap);
  74  # endif
  75      def("rewrap_value_float", by_value<float>::rewrap);
  76      def("rewrap_value_double", by_value<double>::rewrap);
  77 @@ -106,8 +106,8 @@
  78  // using Python's macro instead of Boost's - we don't seem to get the
  79  // config right all the time.
  80  # ifdef HAVE_LONG_LONG
  81 -    def("rewrap_const_reference_long_long", by_const_reference<LONG_LONG>::rewrap);
  82 -    def("rewrap_const_reference_unsigned_long_long", by_const_reference<unsigned LONG_LONG>::rewrap);
  83 +    def("rewrap_const_reference_long_long", by_const_reference<long long>::rewrap);
  84 +    def("rewrap_const_reference_unsigned_long_long", by_const_reference<unsigned long long>::rewrap);
  85  # endif
  86      def("rewrap_const_reference_float", by_const_reference<float>::rewrap);
  87      def("rewrap_const_reference_double", by_const_reference<double>::rewrap);
  88 --- boost-1.30.2/libs/python/build/Jamfile.orig 2003-01-10 16:04:05.000000000 +0100
  89 +++ boost-1.30.2/libs/python/build/Jamfile      2004-02-07 22:15:09.786172456 +0100
  90 @@ -59,6 +59,7 @@
  91      : ../src/$(sources)
  92      : $(BOOST_PYTHON_V2_PROPERTIES)
  93        <define>BOOST_PYTHON_SOURCE
  94 +      <find-library>python$(PYTHON_VERSION)
  95        $(bpl-linkflags)
  96          <msvc-stlport><release>$(msvc-stlport-workarounds)
  97        ;