From: Andres Noetzli <andres.noetzli@gmail.com>
Date: Thu, 11 Oct 2018 03:07:34 +0000 (-0700)
Subject: Fix compiler warnings (#2602)
X-Git-Tag: cvc5-1.0.0~4437
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=960dfe7f894e57d3e8b7ca13867d212e982ff68d;p=cvc5.git

Fix compiler warnings (#2602)
---

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<Node>& es,
                   const std::map<Node, Node>& e_to_cond,
                   const std::map<Node, std::vector<Node>>& 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<Node>& 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