[Scipy-svn] r2928 - in trunk/Lib: sparse/sparsetools special

scipy-svn@scip... scipy-svn@scip...
Tue Apr 17 05:41:13 CDT 2007


Author: fullung
Date: 2007-04-17 05:41:09 -0500 (Tue, 17 Apr 2007)
New Revision: 2928

Modified:
   trunk/Lib/sparse/sparsetools/sparsetools.h
   trunk/Lib/special/setup.py
Log:
Fixed some more MSVC compilation issues.


Modified: trunk/Lib/sparse/sparsetools/sparsetools.h
===================================================================
--- trunk/Lib/sparse/sparsetools/sparsetools.h	2007-04-17 10:11:39 UTC (rev 2927)
+++ trunk/Lib/sparse/sparsetools/sparsetools.h	2007-04-17 10:41:09 UTC (rev 2928)
@@ -928,7 +928,7 @@
 			   T Ax[])
 {
   const T zero = ZERO<T>();
-  I isort[ n_col ];
+  I* isort = new I[ n_col ];
   std::vector<I> itemp(n_col,0);
   std::vector<T> atemp(n_col,zero);
 
@@ -952,6 +952,7 @@
       Ax[jj] = atemp[ii];
     }
   }
+  delete[] isort;
 }
 			   
 

Modified: trunk/Lib/special/setup.py
===================================================================
--- trunk/Lib/special/setup.py	2007-04-17 10:11:39 UTC (rev 2927)
+++ trunk/Lib/special/setup.py	2007-04-17 10:41:09 UTC (rev 2928)
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+import sys
 from os.path import join
 from distutils.sysconfig import get_python_inc
 
@@ -9,9 +10,10 @@
     config = Configuration('special', parent_package, top_path)
 
     define_macros = []
-#    if sys.platform=='win32':
+    if sys.platform=='win32':
 #        define_macros.append(('NOINFINITIES',None))
 #        define_macros.append(('NONANS',None))
+        define_macros.append(('_USE_MATH_DEFINES',None))
 
     # C libraries
     config.add_library('c_misc',sources=[join('c_misc','*.c')])



More information about the Scipy-svn mailing list