Changeset 627:20dac2104519 in lemon-1.2 for tools

Timestamp:

04/28/09 14:51:34 (16 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Parents:

626:58357e986a08 (diff), 500:8a144437db7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge and extend the fix of #275

File:

• tools/dimacs-solver.cc (modified) (2 diffs)

tools/dimacs-solver.cc

@@ -201 +201 @@
     .boolOption("int","Use 'int' for capacities, costs etc. (default)")
     .optionGroup("datatype","int")
-#ifdef HAVE_LONG_LONG
+#ifdef LEMON_HAVE_LONG_LONG
     .boolOption("long","Use 'long long' for capacities, costs etc.")
     .optionGroup("datatype","long")
@@ -268 +268 @@
   else if(ap.given("ldouble"))
     solve<long double>(ap,is,os,desc);
-#ifdef HAVE_LONG_LONG
+#ifdef LEMON_HAVE_LONG_LONG
   else if(ap.given("long"))
     solve<long long>(ap,is,os,desc);