Changeset 3033


Ignore:
Timestamp:
May 7, 2020 6:36:39 AM (2 months ago)
Author:
stefan
Message:

CbcLinked? should include CbcSolverConfig?.h; fix compilation

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/CbcLinked.cpp

    r2922 r3033  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #include "CbcConfig.h"
     6#include "CbcSolverConfig.h"
    77
    88#include "CoinTime.hpp"
  • trunk/src/CbcLinkedUtils.cpp

    r2922 r3033  
    2020
    2121#include "ClpConfig.h"
    22 #include "CbcConfig.h"
     22#include "CbcSolverConfig.h"
    2323#ifdef CBC_HAS_ASL
    2424#include "CoinPragma.hpp"
     
    793793    if (!nlc) {
    794794      type = 3;
    795       delete cs->objective_;
    796       cs->objective_ = new ClpAmplObjective(amplInfo);
     795      delete cs.objective_;
     796      cs.objective_ = new ClpAmplObjective(amplInfo);
    797797    } else {
    798798      type = 4;
     
    800800      constraints = new ClpConstraint *[numberConstraints];
    801801      if (nlo) {
    802         delete cs->objective_;
    803         cs->objective_ = new ClpAmplObjective(amplInfo);
     802        delete cs.objective_;
     803        cs.objective_ = new ClpAmplObjective(amplInfo);
    804804      }
    805805      for (int i = 0; i < numberConstraints; i++) {
Note: See TracChangeset for help on using the changeset viewer.