Mercurial > pytave

changeset 17:1a2c103d1789 lp-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix g++ compile error on ubuntu 8.10
author David Grundberg <individ@acc.umu.se>
date Mon, 10 Nov 2008 22:03:19 +0100
parents 1b8ccabfa296 (current diff) ae09a25b1206 (diff)
children 7a5fbc15fc6e 84be5ee8cc44
files
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 23 20:47:12 2008 +0200
+++ b/ChangeLog	Mon Nov 10 22:03:19 2008 +0100
@@ -1,3 +1,8 @@
+2008-11-10  David Grundberg  <individ@acc.umu.se>
+
+	* octave_to_python.cc: Remove static storage class on explicitely
+	specialized templates.
+
 2008-10-23  David Grundberg  <individ@acc.umu.se>
 
 	* pytave.cc: Use octave_main() to initialize Octave. Introduces
--- a/octave_to_python.cc	Thu Oct 23 20:47:12 2008 +0200
+++ b/octave_to_python.cc	Mon Nov 10 22:03:19 2008 +0100
@@ -71,7 +71,7 @@
    }
 
    template <>
-   static void copy_octarray_to_pyarrobj<double, NDArray>(
+   void copy_octarray_to_pyarrobj<double, NDArray>(
                                   PyArrayObject *pyarr,
                                   const NDArray &matrix,
                                   const unsigned int matindex,
@@ -100,7 +100,7 @@
 
 #ifdef PYTAVE_USE_OCTAVE_FLOATS
    template <>
-   static void copy_octarray_to_pyarrobj<float, FloatNDArray>(
+   void copy_octarray_to_pyarrobj<float, FloatNDArray>(
                                   PyArrayObject *pyarr,
                                   const FloatNDArray &matrix,
                                   const unsigned int matindex,