math/couenne/files/patch-Couenne_src_readnl_readnl.cpp


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

- workaround for the 'filename' macro name clash: https://github.com/coin-or-tools/ThirdParty-ASL/issues/4

--- Couenne/src/readnl/readnl.cpp.orig	2021-05-03 20:42:36 UTC
+++ Couenne/src/readnl/readnl.cpp
@@ -10,6 +10,8 @@
 
 #include "asl.h"
 
+#undef filename
+
 // Added to avoid compiler issues with gcc 6.2.1 --- see https://github.com/JuliaOpt/CoinOptServices.jl/issues/27#issuecomment-290960312
 #undef strtod
 
@@ -60,7 +62,7 @@ void createCommonExpr (CouenneProblem *p, const ASL *a
 // Reads a MINLP from an AMPL .nl file through the ASL methods
 int CouenneProblem::readnl (const ASL *asl) {
 
-  problemName_ = filename;
+  problemName_ = asl->i.filename_; //filename;
 
   // number of defined variables (aka common expressions)
   ndefined_ = como + comc + comb + como1 + comc1;