Changeset 744


Ignore:
Timestamp:
Aug 10, 2007 9:53:15 PM (12 years ago)
Author:
lou
Message:

Remove `using namespace std' from CbcTree?.hpp, fix collateral damage.

Location:
branches/BSP/trunk/Cbc/src
Files:
4 edited

Legend:

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

    r706 r744  
    299299  { return branch();}
    300300
     301  using OsiBranchingObject::print ;
    301302  /** \brief Print something about branch - only if log level high
    302303  */
  • branches/BSP/trunk/Cbc/src/CbcTree.cpp

    r724 r744  
    4141{
    4242  comparison_.test_ = &compare;
    43   make_heap(nodes_.begin(), nodes_.end(), comparison_);
     43  std::make_heap(nodes_.begin(), nodes_.end(), comparison_);
    4444}
    4545
     
    5959  assert(x->objectiveValue()!=COIN_DBL_MAX&&x->nodeInfo());
    6060  nodes_.push_back(x);
    61   push_heap(nodes_.begin(), nodes_.end(), comparison_);
     61  std::push_heap(nodes_.begin(), nodes_.end(), comparison_);
    6262}
    6363
     
    6565void
    6666CbcTree::pop() {
    67   pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     67  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    6868  nodes_.pop_back();
    6969}
     
    8989#if 0
    9090      // take off
    91       pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     91      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    9292      nodes_.pop_back();
    9393      delete best;
     
    119119      // can pop
    120120      // take off
    121       pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     121      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    122122      nodes_.pop_back();
    123123    } else {
     
    127127  } else if (best) {
    128128    // take off
    129     pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     129    std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    130130    nodes_.pop_back();
    131131  }
     
    330330CbcTree::pop() {
    331331#if 0
    332   pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     332  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    333333  nodes_.pop_back();
    334334#else
     
    362362#if 0
    363363      // take off
    364       pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     364      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    365365      nodes_.pop_back();
    366366      delete best;
     
    392392      // can pop
    393393      // take off
    394       pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     394      std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    395395      nodes_.pop_back();
    396396    } else {
     
    401401    // take off
    402402#if 0
    403     pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     403    std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    404404    nodes_.pop_back();
    405405#else
  • branches/BSP/trunk/Cbc/src/CbcTree.hpp

    r724 r744  
    33#ifndef CbcTree_H
    44#define CbcTree_H
    5 using namespace std;
    6 
    75
    86#include <vector>
  • branches/BSP/trunk/Cbc/src/CbcTreeLocal.cpp

    r511 r744  
    384384           x->nodeInfo()->nodeNumber(),x,x->nodeInfo());
    385385#endif
    386   push_heap(nodes_.begin(), nodes_.end(), comparison_);
     386  std::push_heap(nodes_.begin(), nodes_.end(), comparison_);
    387387}
    388388
     
    390390void
    391391CbcTreeLocal::pop() {
    392   pop_heap(nodes_.begin(), nodes_.end(), comparison_);
     392  std::pop_heap(nodes_.begin(), nodes_.end(), comparison_);
    393393  nodes_.pop_back();
    394394}
     
    660660      nodes_.push_back(localNode_);
    661661      localNode_=localNode2;
    662       make_heap(nodes_.begin(), nodes_.end(), comparison_);
     662      std::make_heap(nodes_.begin(), nodes_.end(), comparison_);
    663663    }
    664664  }
Note: See TracChangeset for help on using the changeset viewer.