[SciPy-Dev] Weave patch applied by ubuntu.

[Zbyszek Szmek]

On Sun, Nov 14, 2010 at 10:11:48AM -0700, Charles R Harris wrote:
> I note that of the three new inclusions of <cstdlib> only one is
> currently present in scipy. Can someone familiar
> with the code confirm that all the includes are needed.
> 
> Chuck
> 
> diff -u python-scipy-0.7.0/debian/changelog python-scipy-0.7.0/debian/changelog
> --- python-scipy-0.7.0/debian/changelog
> +++ python-scipy-0.7.0/debian/changelog
> @@ -1,3 +1,9 @@
> +python-scipy (0.7.0-2ubuntu1) lucid; urgency=low
> +
> +  * Fix scipy.weave.inline compilations (LP: #302649)
> +
> + -- Sameer Morar <smorar at gmail.com>  Wed, 29 Sep 2010 15:34:04 +0200
> +
>  python-scipy (0.7.0-2) unstable; urgency=medium
> 
>    [ Julien Lavergne ]
> only in patch2:
> unchanged:
> --- python-scipy-0.7.0.orig/scipy/weave/blitz/blitz/mathfunc.h
> +++ python-scipy-0.7.0/scipy/weave/blitz/blitz/mathfunc.h
> @@ -12,6 +12,8 @@
>   #include <blitz/prettyprint.h>
>  #endif
> 
> +#include <cstdlib>
> +

prettyprint.h is included a few lines above. Therefore at least this one isn't necessary.


>  BZ_NAMESPACE(blitz)
> 
>  // abs(P_numtype1)    Absolute value
> only in patch2:
> unchanged:
> --- python-scipy-0.7.0.orig/scipy/weave/blitz/blitz/blitz.h
> +++ python-scipy-0.7.0/scipy/weave/blitz/blitz/blitz.h
> @@ -65,6 +65,8 @@
> 
>  #define BZ_THROW                     // Needed in <blitz/numinquire.h>
> 
> +#include <cstdlib>
> +
>  BZ_NAMESPACE(blitz)
> 
>  #ifdef BZ_HAVE_STD
> only in patch2:
> unchanged:
> --- python-scipy-0.7.0.orig/scipy/weave/blitz/blitz/prettyprint.h
> +++ python-scipy-0.7.0/scipy/weave/blitz/blitz/prettyprint.h
> @@ -22,6 +22,8 @@
>  #ifndef BZ_PRETTYPRINT_H
>  #define BZ_PRETTYPRINT_H
> 
> +#include <cstdlib>
> +
>  BZ_NAMESPACE(blitz)
> 
>  class prettyPrintFormat {

> _______________________________________________
> SciPy-Dev mailing list
> SciPy-Dev at scipy.org
> http://mail.scipy.org/mailman/listinfo/scipy-dev