Merge branch 'master' of github.com:google/or-tools

lperron · lperron · commit f6b59dea7d56 · 2021-12-14T21:55:28.000+01:00
diff --git a/ortools/sat/cp_model.cc b/ortools/sat/cp_model.cc
@@ -130,7 +130,7 @@ LinearExpr IntVar::AddConstant(int64_t value) const {
   return LinearExpr(*this).AddConstant(value);
 }
 
-Domain IntVar::Domain() const {
+  ::operations_research::Domain IntVar::Domain() const {
   if (builder_ == nullptr) return Domain();
   return ReadDomainFromProto(builder_->Proto().variables(index_));
 }
diff --git a/ortools/sat/cp_model.h b/ortools/sat/cp_model.h
@@ -173,7 +173,7 @@ class IntVar {
   }
 
   // Returns the domain of the variable.
-  Domain Domain() const;
+  ::operations_research::Domain Domain() const;
 
   std::string DebugString() const;
 

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ LinearExpr IntVar::AddConstant(int64_t value) const {`
`130`	`130`	`return LinearExpr(*this).AddConstant(value);`
`131`	`131`	`}`
`132`	`132`
`133`		`-Domain IntVar::Domain() const {`
	`133`	`+ ::operations_research::Domain IntVar::Domain() const {`
`134`	`134`	`if (builder_ == nullptr) return Domain();`
`135`	`135`	`return ReadDomainFromProto(builder_->Proto().variables(index_));`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class IntVar {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`// Returns the domain of the variable.`
`176`		`- Domain Domain() const;`
	`176`	`+ ::operations_research::Domain Domain() const;`
`177`	`177`
`178`	`178`	`std::string DebugString() const;`
`179`	`179`