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

google · Dec 14, 2021 · f6b59de · f6b59de
2 parents 65dfdd2 + 60b3dd7
commit f6b59de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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;