Ignore:
Timestamp:
Aug 11, 2007 12:22:33 AM (14 years ago)
Author:
lou
Message:

Add using declarations to suppress compiler warnings about hidden function
declarations.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/BSP/trunk/Cbc/src/CbcLinked.hpp

    r740 r746  
    377377  virtual void setModel(CbcModel * model);
    378378 
     379  using CbcHeuristic::solution ;
    379380  /** returns 0 if no solution, 1 if valid solution.
    380381      Sets solution values if good, sets objective value (only if good)
     
    446447  virtual ~OsiOldLink ();
    447448 
     449  using OsiObject::infeasibility ;
    448450  /// Infeasibility - large is 0.5
    449451  virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
    450452
     453  using OsiObject::feasibleRegion ;
    451454  /** Set bounds to fix the variable at the current (integer) value.
    452455
     
    511514  virtual ~OsiOldLinkBranchingObject ();
    512515 
     516  using OsiBranchingObject::branch ;
    513517  /// Does next branch and updates state
    514518  virtual double branch(OsiSolverInterface * solver);
    515519
     520  using OsiBranchingObject::print ;
    516521  /** \brief Print something about branch - only if log level high
    517522  */
     
    592597  virtual ~OsiLink ();
    593598 
     599  using OsiObject::infeasibility ;
    594600  /// Infeasibility - large is 0.5
    595601  virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
    596602
     603  using OsiObject::feasibleRegion ;
    597604  /** Set bounds to fix the variable at the current (integer) value.
    598605
     
    664671  virtual ~OsiLinkBranchingObject ();
    665672 
     673  using OsiBranchingObject::branch ;
    666674  /// Does next branch and updates state
    667675  virtual double branch(OsiSolverInterface * solver);
    668676
     677  using OsiBranchingObject::print ;
    669678  /** \brief Print something about branch - only if log level high
    670679  */
     
    719728  virtual ~OsiBiLinear ();
    720729 
     730  using OsiObject::infeasibility ;
    721731  /// Infeasibility - large is 0.5
    722732  virtual double infeasibility(const OsiBranchingInformation * info,int & whichWay) const;
    723733
     734  using OsiObject::feasibleRegion ;
    724735  /** Set bounds to fix the variable at the current (integer) value.
    725736
     
    943954  virtual ~OsiBiLinearBranchingObject ();
    944955 
     956  using OsiBranchingObject::branch ;
    945957  /// Does next branch and updates state
    946958  virtual double branch(OsiSolverInterface * solver);
    947959
     960  using OsiBranchingObject::print ;
    948961  /** \brief Print something about branch - only if log level high
    949962  */
     
    10411054  virtual ~OsiSimpleFixedInteger ();
    10421055 
     1056  using OsiObject::infeasibility ;
    10431057  /// Infeasibility - large is 0.5
    10441058  virtual double infeasibility(const OsiBranchingInformation * info, int & whichWay) const;
     1059
    10451060  /** Creates a branching object
    10461061
     
    10891104  virtual ~OsiUsesBiLinear ();
    10901105 
     1106  using OsiObject::infeasibility ;
    10911107  /// Infeasibility - large is 0.5
    10921108  virtual double infeasibility(const OsiBranchingInformation * info, int & whichWay) const;
     1109
    10931110  /** Creates a branching object
    10941111
     
    10961113  */
    10971114  virtual OsiBranchingObject * createBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info, int way) const;
     1115
     1116  using OsiObject::feasibleRegion ;
    10981117  /** Set bounds to fix the variable at the current value.
    10991118
     
    11021121  */
    11031122  virtual double feasibleRegion(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
     1123
    11041124  /// Add all bi-linear objects
    11051125  void addBiLinearObjects(OsiSolverLink * solver);
Note: See TracChangeset for help on using the changeset viewer.