Changeset 1248:14394c9603c2 in lemon for test/lp_test.cc

Timestamp:

08/06/13 12:19:11 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.1

Parents:

1243:79f149ee0230 (diff), 1247:115031ac8001 (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 further fixes #470 to branch 1.1

Files:

• test/lp_test.cc (modified) (1 diff)
• test/lp_test.cc (modified) (1 diff)

test/lp_test.cc

@@ -199 +199 @@
       c = c <= 4;
       LP::Constr c2;
+#if ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ == 3 )
+      c2 = ( -3 <= v ) <= 4;
+#else
       c2 = -3 <= v <= 4;
+#endif
+
     }
 

test/lp_test.cc

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2011
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).