Changeset d6acb55 in tol

Timestamp:

Jan 10, 2015, 3:13:18 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

ee23e9e

Parents:

995e9b3

Message:

vmat.cpp:591:27: warning: converting to non-pointer type ‘int’ from NULL [-Wconversion-null]

common_->try_catch = NULL;

y varios del tipo

warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6426 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/vmatrix_type

Files:

• vmat.cpp (modified) (7 diffs)
• vmat_arith.cpp (modified) (1 diff)
• vmat_stats.cpp (modified) (2 diffs)

tol/btol/vmatrix_type/vmat.cpp

@@ -589 +589 @@
   common_->print_function = cholmod_print_function;
   common_->error_handler  = cholmod_error_handler;
-  common_->try_catch      = NULL;
+  common_->try_catch      = 0;
 
   //Stop when non positive definite is found
@@ -1151 +1151 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* name = "GetCell";
+  static const char* name = "GetCell";
   int accessCode;
   double* y = BVMat::checkCell(i, j, accessCode, true, name, true);
@@ -1163 +1163 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* name = "PutCell";
+  static const char* name = "PutCell";
   int accessCode;
   double* y = BVMat::checkCell(i, j, accessCode, false, name, true);
@@ -1191 +1191 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* name = "PutCells";
+  static const char* name = "PutCells";
   int r = triplet.Rows();
   int c = triplet.Columns();
@@ -1400 +1400 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "PutVMatBlock";
+  static const char* fName = "PutVMatBlock";
   int accessCode = false;
   int r=Rows();
@@ -1503 +1503 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "Enlarge";
+  static const char* fName = "Enlarge";
   int result = 0;
   int *i, *j, k;
@@ -1530 +1530 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "MergeRows";
+  static const char* fName = "MergeRows";
   int result = 0;
   int *i, *j, *rIdx, r, k, K, n, N = items.Card();

tol/btol/vmatrix_type/vmat_arith.cpp

@@ -539 +539 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "KroneckerProd";
+  static const char* fName = "KroneckerProd";
   if(!A.CheckDefined(fName)) { return(-1); }
   if(!B.CheckDefined(fName)) { return(-1); }

tol/btol/vmatrix_type/vmat_stats.cpp

@@ -498 +498 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "GetBoundsInPolytope";
+  static const char* fName = "GetBoundsInPolytope";
   if(!D .CheckDefined(fName)) { return(-1); }
   if(!d_.CheckDefined(fName)) { return(-1); }
@@ -714 +714 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-  static char* fName = "TruncStdGaussian";
+  static const char* fName = "TruncStdGaussian";
   if(!D .CheckDefined(fName)) { return; }
   if(!d_.CheckDefined(fName)) { return; }