[PPL-devel] [GIT] ppl/ppl(MPI): Fix compiler errors when using non-distributed matrices .

Marco Poletti poletti.marco at gmail.com
Fri Sep 17 21:30:12 CEST 2010


Module: ppl/ppl
Branch: MPI
Commit: 176f106074935a5735288cb540ee813b54dde36c
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=176f106074935a5735288cb540ee813b54dde36c

Author: Marco Poletti <poletti.marco at gmail.com>
Date:   Fri Sep 17 21:31:24 2010 +0200

Fix compiler errors when using non-distributed matrices.

---

 src/MIP_Problem.defs.hh |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/MIP_Problem.defs.hh b/src/MIP_Problem.defs.hh
index 4480603..5ab651d 100644
--- a/src/MIP_Problem.defs.hh
+++ b/src/MIP_Problem.defs.hh
@@ -27,11 +27,8 @@ site: http://www.cs.unipr.it/ppl/ . */
 #include "globals.types.hh"
 #include "Row.defs.hh"
 
-#ifdef USE_PPL_DISTRIBUTED_SPARSE_MATRIX
 #include "Distributed_Sparse_Matrix.defs.hh"
-#else
 #include "Matrix.defs.hh"
-#endif
 
 #include "Linear_Expression.defs.hh"
 #include "Constraint.types.hh"
@@ -451,10 +448,8 @@ private:
   Matrix tableau;
 #endif
 
-  typedef Row working_cost_type;
-
   //! The working cost function.
-  working_cost_type working_cost;
+  Row working_cost;
 
   //! A map between the variables of `input_cs' and `tableau'.
   /*!




More information about the PPL-devel mailing list