Changeset 2205


Ignore:
Timestamp:
Jul 7, 2015 4:41:37 PM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.hpp

    r2094 r2205  
    23202320        maximumNumberIterations_ = value;
    23212321    }
    2322 #ifdef COIN_HAS_NTY
    23232322    /// Symmetry information
    23242323    inline CbcSymmetry * symmetryInfo() const
    23252324    { return symmetryInfo_;} 
    2326 #endif
    23272325    /// Set depth for fast nodes
    23282326    inline void setFastNodeDepth(int value) {
     
    27702768    CbcEventHandler *eventHandler_ ;
    27712769# endif
    2772 #ifdef COIN_HAS_NTY
    2773   /// Symmetry information
    2774   CbcSymmetry * symmetryInfo_;
    2775 #endif
     2770   /// Symmetry information
     2771    CbcSymmetry * symmetryInfo_;
    27762772    /// Total number of objects
    27772773    int numberObjects_;
Note: See TracChangeset for help on using the changeset viewer.