Changeset 1712 for trunk/Cbc/src


Ignore:
Timestamp:
Jul 31, 2011 10:52:40 AM (8 years ago)
Author:
stefan
Message:

merge chgset1711 from stable/2.7

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Cbc

  • trunk/Cbc/src/CbcModel.hpp

    r1661 r1712  
    18881888    //@}
    18891889
    1890     /// To do with threads
     1890    ///@name Multithreading
    18911891    //@{
     1892    /// Indicates whether Cbc library has been compiled with multithreading support
     1893    static bool haveMultiThreadSupport();
    18921894    /// Get pointer to masterthread
    18931895    CbcThread * masterThread() const {
     
    19841986    //@}
    19851987
    1986     /// semi-private i.e. users should not use
     1988    ///@name semi-private i.e. users should not use
    19871989    //@{
    19881990    /// Get how many Nodes it took to solve the problem.
  • trunk/Cbc/src/CbcThread.cpp

    r1573 r1712  
    18951895    }
    18961896}
     1897
     1898/// Indicates whether Cbc library has been compiled with multithreading support
     1899bool CbcModel::haveMultiThreadSupport() { return true; }
     1900
    18971901#else
    1898 // Dummy so file not empty
    18991902// Default constructor
    19001903CbcBaseModel::CbcBaseModel() {}
    1901 #endif
    1902 
     1904
     1905bool CbcModel::haveMultiThreadSupport() { return false; }
     1906#endif
     1907
Note: See TracChangeset for help on using the changeset viewer.