Changeset 2205

Timestamp:

Jul 7, 2015 4:41:37 PM (4 years ago)

Author:

stefan

Message:

don't make existence of CbcModel? members depend on whether COIN_HAS_NTY is defined

• this symbol might be defined only while compiling Cbc, e.g., in its internal config.h, but not when a user (e.g., Bonmin), builds against Cbc

File:

• trunk/Cbc/src/CbcModel.hpp (modified) (2 diffs)

trunk/Cbc/src/CbcModel.hpp

@@ -2320 +2320 @@
         maximumNumberIterations_ = value;
     }
-#ifdef COIN_HAS_NTY
     /// Symmetry information
     inline CbcSymmetry * symmetryInfo() const
     { return symmetryInfo_;}  
-#endif
     /// Set depth for fast nodes
     inline void setFastNodeDepth(int value) {
@@ -2770 +2768 @@
     CbcEventHandler *eventHandler_ ;
 # endif
-#ifdef COIN_HAS_NTY
-  /// Symmetry information
-  CbcSymmetry * symmetryInfo_;
-#endif
+   /// Symmetry information
+    CbcSymmetry * symmetryInfo_;
     /// Total number of objects
     int numberObjects_;