always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes

Browse Source
This commit is contained in:
lperron@google.com
2014-05-26 22:13:00 +00:00
parent 22079334db
commit 3102bae45c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/constraint_solver/interval.cc
View File

@@ -1325,7 +1325,7 @@ std::string StartVarPerformedIntervalVar::DebugString() const {
class StartVarIntervalVar : public BaseIntervalVar {
public:
StartVarIntervalVar(Solver* const s, IntVar* const start, int64 duration,
IntVar* const performed, const string& name);
IntVar* const performed, const std::string& name);
virtual ~StartVarIntervalVar() {}
virtual int64 StartMin() const;
@@ -1373,7 +1373,7 @@ class StartVarIntervalVar : public BaseIntervalVar {
return performed_->OldMin() == performed_->OldMax();
}
virtual void WhenPerformedBound(Demon* const d) { performed_->WhenBound(d); }
virtual string DebugString() const;
virtual std::string DebugString() const;
virtual void Accept(ModelVisitor* const visitor) const {
visitor->VisitIntervalVariable(this, "", 0, NullInterval());
@@ -1410,7 +1410,7 @@ class StartVarIntervalVar : public BaseIntervalVar {
StartVarIntervalVar::StartVarIntervalVar(Solver* const s, IntVar* const start,
int64 duration,
IntVar* const performed,
const string& name)
const std::string& name)
: BaseIntervalVar(s, name),
start_(start),
duration_(duration),
@@ -1528,7 +1528,7 @@ void StartVarIntervalVar::SetPerformed(bool val) {
}
}
string StartVarIntervalVar::DebugString() const {
std::string StartVarIntervalVar::DebugString() const {
const std::string& var_name = name();
if (performed_->Max() == 0) {
if (!var_name.empty()) {
@@ -1537,7 +1537,7 @@ string StartVarIntervalVar::DebugString() const {
return "IntervalVar(performed = false)";
}
} else {
string out;
std::string out;
if (!var_name.empty()) {
out = var_name + "(start = ";
} else {