From 960dfe7f894e57d3e8b7ca13867d212e982ff68d Mon Sep 17 00:00:00 2001 From: Andres Noetzli Date: Wed, 10 Oct 2018 20:07:34 -0700 Subject: [PATCH] Fix compiler warnings (#2602) --- src/expr/datatype.cpp | 2 +- src/theory/quantifiers/sygus/cegis_unif.h | 7 +++++++ src/theory/strings/theory_strings.h | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/expr/datatype.cpp b/src/expr/datatype.cpp index 66caedf8e..8bedd4979 100644 --- a/src/expr/datatype.cpp +++ b/src/expr/datatype.cpp @@ -1316,7 +1316,7 @@ void DatatypeConstructorArg::toStream(std::ostream& out) const else if (d_selector.isNull()) { string typeName = d_name.substr(d_name.find('\0') + 1); - out << (typeName == "") ? "[self]" : typeName; + out << ((typeName == "") ? "[self]" : typeName); return; } else diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h index 448150d06..972d07af7 100644 --- a/src/theory/quantifiers/sygus/cegis_unif.h +++ b/src/theory/quantifiers/sygus/cegis_unif.h @@ -71,6 +71,13 @@ class CegisUnifEnumDecisionStrategy : public DecisionStrategyFmf void initialize(const std::vector& es, const std::map& e_to_cond, const std::map>& strategy_lemmas); + + /* + * Do not hide the zero-argument version of initialize() inherited from the + * base class + */ + using DecisionStrategy::initialize; + /** get the current set of enumerators for strategy point e * * Index 0 adds the set of return value enumerators to es, index 1 adds the diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index 6c653bf05..236c3906c 100644 --- a/src/theory/strings/theory_strings.h +++ b/src/theory/strings/theory_strings.h @@ -740,6 +740,12 @@ private: /** initialize */ void initialize(const std::vector& vars); + /* + * Do not hide the zero-argument version of initialize() inherited from the + * base class + */ + using DecisionStrategyFmf::initialize; + private: /** * User-context-dependent node corresponding to the sum of the lengths of -- 2.30.2