[opengm] 274/386: Fix an #elif statement to find the cplex backend for the struct-max-margin solver

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:38:09 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit c7cbe6cb368133cc8c91cf5b572eca85163fe3f5
Author: Carsten Haubold <carstenhaubold at googlemail.com>
Date:   Fri Sep 18 17:29:15 2015 +0200

    Fix an #elif statement to find the cplex backend for the struct-max-margin solver
---
 include/opengm/learning/solver/QuadraticSolverFactory.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/opengm/learning/solver/QuadraticSolverFactory.h b/include/opengm/learning/solver/QuadraticSolverFactory.h
index 43ca5bc..e986630 100644
--- a/include/opengm/learning/solver/QuadraticSolverFactory.h
+++ b/include/opengm/learning/solver/QuadraticSolverFactory.h
@@ -3,7 +3,7 @@
 
 #ifdef WITH_GUROBI
 #include "GurobiBackend.h"
-#elif WITH_CPLEX
+#elif defined(WITH_CPLEX)
 #include "CplexBackend.h"
 #endif
 
@@ -19,7 +19,7 @@ public:
 
 #ifdef WITH_GUROBI
 	return new GurobiBackend();
-#elif WITH_CPLEX
+#elif defined(WITH_CPLEX)
         return new CplexBackend();
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git



More information about the debian-science-commits mailing list