Mercurial > forge

changeset 11321:11f71a43d311 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updating according to the new rsb.h: rsb_elemental_pow -> rsb_elemental_binop ; rsb_sizeof -> rsb_get_matrix_info
author michelemartone
date Mon, 24 Dec 2012 12:04:05 +0000
parents 00070948e2cb
children 208a1a9bd97f
files main/sparsersb/src/sparsersb.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/sparsersb.cc	Sun Dec 23 12:48:41 2012 +0000
+++ b/main/sparsersb/src/sparsersb.cc	Mon Dec 24 12:04:05 2012 +0000
@@ -380,7 +380,7 @@
 		octave_idx_type columns (void) const { return this->cols(); }
 		octave_idx_type nzmax (void) const { return this->nnz(); }
 		octave_idx_type capacity (void) const { return this->nnz(); }
-		size_t byte_size (void) const { RSBOI_0_EMCHECK(this->A);return rsb_sizeof(this->A); }
+		size_t byte_size (void) const { RSBOI_0_EMCHECK(this->A);size_t so=0;rsb_get_matrix_info(this->A,RSB_MIF_BYTE_SIZE__TO__SIZE_T,&so);return so; }
 
 		virtual ~octave_sparse_rsb_matrix (void)
 		{
@@ -1242,7 +1242,7 @@
 	rsb_err_t errval=RSB_ERR_NO_ERROR;
 	RSBOI_T alpha=v2.scalar_value();
 	if(!m)return m;
-	errval=rsb_elemental_pow(m->A,&alpha);
+	errval = rsb_elemental_binop(m->A,RSB_ELOPF_POW,&alpha);
 	RSBOI_PERROR(errval);
 	return m;
 }