few missing ret values

sympiler · Jun 15, 2020 · 4928d2c · 4928d2c
1 parent 19f7ec6
commit 4928d2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/def.h b/def.h
@@ -11,7 +11,7 @@
 #include <cassert>
 #include <iostream>
 #include <queue>
-#include <cstring>
+#include <string>
 #include <cmath>
 
 

diff --git a/mp_format_converter.h b/mp_format_converter.h
@@ -821,6 +821,7 @@ namespace format {
     bounded_to_smp();
     return smp_->C_ ? smp_->C_->m : 0;
    }
+   return 0;
   }
 
   size_t num_var(){

diff --git a/smp_format.h b/smp_format.h
@@ -7,6 +7,7 @@
 
 #include <utility>
 
+#include <string>
 #include "io.h"
 #include "sparse_utilities.h"
 

diff --git a/sparse_utilities.h b/sparse_utilities.h
@@ -3,7 +3,7 @@
 //
 
 #include <omp.h>
-#include <cstring>
+#include <string>
 #include <cassert>
 #include <cmath>
 #include "def.h"
@@ -35,7 +35,8 @@ namespace sym_lib {
   colind = new int[nnz]();
   values = new double[nnz]();
 
-  memset(rowCnt, 0, sizeof(int) * nrow);
+  std::fill_n(rowCnt, nrow, 0);
+  //memset(rowCnt, 0, sizeof(int) * nrow);
   for (int i = 0; i < ncol; i++) {
    for (int j = Ap[i]; j < Ap[i + 1]; j++) {
     int row = Ai[j];
@@ -70,8 +71,8 @@ namespace sym_lib {
 
   int *colind = B->i;
   double *values = B->x;
-
-  memset(rowCnt, 0, sizeof(int) * nrow);
+  std::fill_n(rowCnt, nrow, 0);
+  //memset(rowCnt, 0, sizeof(int) * nrow);
   for (int i = 0; i < (int)ncol; i++) {
    for (int j = A->p[i]; j < A->p[i + 1]; j++) {
     int row = A->i[j];