Changeset 287


Ignore:
Timestamp:
Mar 27, 2006 6:25:39 PM (14 years ago)
Author:
lou
Message:

Remove CBC_ONLY_CLP build option, ClpEventHandler?.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/CbcModel.hpp

    r279 r287  
    2626class CbcFeasibilityBase;
    2727class CbcStatistics;
    28 #ifdef CBC_ONLY_CLP
    29 class ClpEventHandler ;
    30 #else
    3128class CbcEventHandler ;
    32 #endif
    3329
    3430//#############################################################################
     
    12181214  { return object_[sequence]->priority();};
    12191215
    1220 
    1221 #ifdef CBC_ONLY_CLP
    1222    /// Pass in Event handler (cloned and deleted at end)
    1223    void passInEventHandler(const ClpEventHandler * eventHandler);
    1224    /// Event handler
    1225   ClpEventHandler * eventHandler() const;
    1226 #else
    12271216  /*! \brief Set an event handler
    12281217 
     
    12321221
    12331222  /*! \brief Retrieve a pointer to the event handler */
    1234   CbcEventHandler* CbcModel::eventHandler() const
     1223  inline CbcEventHandler* getEventHandler() const
    12351224  { return (eventHandler_) ; } ;
    1236 #endif
    12371225
    12381226  //@}
Note: See TracChangeset for help on using the changeset viewer.