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

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

Revision: 778
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=778&view=rev
Author:   agraef
Date:     2008-09-17 21:17:01 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Bugfixes.

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

Modified: pure/trunk/runtime.cc
===================================================================
--- pure/trunk/runtime.cc	2008-09-17 15:05:12 UTC (rev 777)
+++ pure/trunk/runtime.cc	2008-09-17 21:17:01 UTC (rev 778)
@@ -817,7 +817,7 @@
       data[i++*tda] = (int)x->data.d;
       break;
     case EXPR::MATRIX: {
-      gsl_matrix_int *mat1 = (gsl_matrix_int*)x->data.mat.p;
+      gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
       if (mat1)
 	for (size_t j = 0; j < mat1->size1; i++, j++)
 	  for (size_t k = 0; k < mat1->size2; k++)
@@ -825,7 +825,7 @@
       break;
     }
     case EXPR::IMATRIX: {
-      gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
+      gsl_matrix_int *mat1 = (gsl_matrix_int*)x->data.mat.p;
       if (mat1)
 	for (size_t j = 0; j < mat1->size1; i++, j++)
 	  memcpy(data+i*tda, mat1->data+j*mat1->tda, ncols*sizeof(int));
@@ -869,7 +869,7 @@
       data[i++] = (int)x->data.d;
       break;
     case EXPR::MATRIX: {
-      gsl_matrix_int *mat1 = (gsl_matrix_int*)x->data.mat.p;
+      gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
       if (mat1)
 	for (size_t j = 0; j < mat1->size1; j++)
 	  for (size_t k = 0; k < mat1->size2; k++)
@@ -878,7 +878,7 @@
       break;
     }
     case EXPR::IMATRIX: {
-      gsl_matrix *mat1 = (gsl_matrix*)x->data.mat.p;
+      gsl_matrix_int *mat1 = (gsl_matrix_int*)x->data.mat.p;
       if (mat1)
 	for (size_t j = 0; j < mat1->size1; j++)
 	  memcpy(data+j*tda+i, mat1->data+j*mat1->tda,


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