[pure-lang-svn] SF.net SVN: pure-lang:[825] pure/trunk/runtime.cc

[<ag...@us...>]

Revision: 825
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=825&view=rev
Author:   agraef
Date:     2008-09-22 10:05:45 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
Add missing HAVE_GSL ifdefs.

Modified Paths:
--------------
    pure/trunk/runtime.cc

Modified: pure/trunk/runtime.cc
===================================================================
--- pure/trunk/runtime.cc	2008-09-22 09:18:10 UTC (rev 824)
+++ pure/trunk/runtime.cc	2008-09-22 10:05:45 UTC (rev 825)
@@ -1350,6 +1350,7 @@
 	  memcpy(data+i*tda, mat1->data+j*mat1->tda, ncols*sizeof(pure_expr*));
       break;
     }
+#ifdef HAVE_GSL
     case EXPR::DMATRIX: {
       gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
       if (mat1)
@@ -1380,6 +1381,7 @@
       }
       break;
     }
+#endif
     default:
       data[i++*tda] = x;
       break;
@@ -1411,6 +1413,7 @@
       i += mat1->size2;
       break;
     }
+#ifdef HAVE_GSL
     case EXPR::DMATRIX: {
       gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
       if (mat1)
@@ -1444,6 +1447,7 @@
       i += mat1->size2;
       break;
     }
+#endif
     default:
       data[i++] = x;
       break;
@@ -1565,12 +1569,14 @@
   switch (target) {
   case EXPR::MATRIX:
     return symbolic_matrix_rows(nrows, ncols, n, xs);
+#ifdef HAVE_GSL
   case EXPR::DMATRIX:
     return double_matrix_rows(nrows, ncols, n, xs);
   case EXPR::CMATRIX:
     return complex_matrix_rows(nrows, ncols, n, xs);
   case EXPR::IMATRIX:
     return int_matrix_rows(nrows, ncols, n, xs);
+#endif
   default:
     return 0;
   }
@@ -1678,12 +1684,14 @@
   switch (target) {
   case EXPR::MATRIX:
     return symbolic_matrix_columns(nrows, ncols, n, xs);
+#ifdef HAVE_GSL
   case EXPR::DMATRIX:
     return double_matrix_columns(nrows, ncols, n, xs);
   case EXPR::CMATRIX:
     return complex_matrix_columns(nrows, ncols, n, xs);
   case EXPR::IMATRIX:
     return int_matrix_columns(nrows, ncols, n, xs);
+#endif
   default:
     return 0;
   }
@@ -2668,12 +2676,14 @@
   switch (target) {
   case EXPR::MATRIX:
     return symbolic_matrix_rows(nrows, ncols, n, xs);
+#ifdef HAVE_GSL
   case EXPR::DMATRIX:
     return double_matrix_rows(nrows, ncols, n, xs);
   case EXPR::CMATRIX:
     return complex_matrix_rows(nrows, ncols, n, xs);
   case EXPR::IMATRIX:
     return int_matrix_rows(nrows, ncols, n, xs);
+#endif
   default:
     assert(0 && "this can't happen");
     return 0;
@@ -2788,12 +2798,14 @@
   switch (target) {
   case EXPR::MATRIX:
     return symbolic_matrix_columns(nrows, ncols, n, xs);
+#ifdef HAVE_GSL
   case EXPR::DMATRIX:
     return double_matrix_columns(nrows, ncols, n, xs);
   case EXPR::CMATRIX:
     return complex_matrix_columns(nrows, ncols, n, xs);
   case EXPR::IMATRIX:
     return int_matrix_columns(nrows, ncols, n, xs);
+#endif
   default:
     assert(0 && "this can't happen");
     return 0;
@@ -4656,6 +4668,7 @@
 	    return 0;
       return 1;
     }
+#ifdef HAVE_GSL
     case EXPR::DMATRIX: {
       gsl_matrix *m1 = (gsl_matrix*)x->data.mat.p;
       gsl_matrix *m2 = (gsl_matrix*)y->data.mat.p;
@@ -4695,6 +4708,7 @@
 	    return 0;
       return 1;
     }
+#endif
     default:
       return 1;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.