Fixing more inconsistent usages of override. (#1575)

diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h
index d2bb8667da13a16faf5a9a6c14af0fd6e37012f7..422ad97961e4d5dc4bc35ced42a74c43982be322 100644 (file)
--- a/src/parser/antlr_input.h
+++ b/src/parser/antlr_input.h
@@ -234,7 +234,7 @@ protected:
   void setAntlr3Parser(pANTLR3_PARSER pParser);
 
   /** Set the Parser object for this input. */
-  virtual void setParser(Parser& parser);
+  void setParser(Parser& parser) override;
 };/* class AntlrInput */
 
 inline std::string AntlrInput::tokenText(pANTLR3_COMMON_TOKEN token) {

diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h
index c35d8d9633adc56fc44647955acfefe465375729..c02c4f45200292024d84f0370279007189d5493a 100644 (file)
--- a/src/parser/cvc/cvc_input.h
+++ b/src/parser/cvc/cvc_input.h
@@ -69,7 +69,7 @@ class CvcInput : public AntlrInput {
    *
    * @throws ParserException if an error is encountered during parsing.
    */
-  Expr parseExpr();
+  Expr parseExpr() override;
 
  private:
   /** Initialize the class. Called from the constructors once the input stream

diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h
index 7577b7bff158ad22388b72855a02cd5a5667d7cc..cd285255f877ddc3031d91ead871f229c412d32d 100644 (file)
--- a/src/parser/smt1/smt1_input.h
+++ b/src/parser/smt1/smt1_input.h
@@ -74,7 +74,7 @@ public:
    *
    * @throws ParserException if an error is encountered during parsing.
    */
-  Expr parseExpr();
+  Expr parseExpr() override;
 
  private:
   /**

diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h
index 0acb5462d574e21a30a9fe4d04c2857e0c53fd47..44187cd2da69c92384bb8633ecea4b235d5e7a51 100644 (file)
--- a/src/parser/smt2/smt2_input.h
+++ b/src/parser/smt2/smt2_input.h
@@ -85,7 +85,7 @@ class Smt2Input : public AntlrInput {
    *
    * @throws ParserException if an error is encountered during parsing.
    */
-  Expr parseExpr();
+  Expr parseExpr() override;
 
 };/* class Smt2Input */
 

diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h
index 0dca60a8290546f2f208903c29d748d723b4986b..58d78fb760a1188e4b0a09f266d2c44effc562b4 100644 (file)
--- a/src/parser/smt2/sygus_input.h
+++ b/src/parser/smt2/sygus_input.h
@@ -82,7 +82,7 @@ class SygusInput : public AntlrInput {
    *
    * @throws ParserException if an error is encountered during parsing.
    */
-  Expr parseExpr();
+  Expr parseExpr() override;
 
 };/* class SygusInput */
 

diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h
index 5dd56034da00d3f520751f7065604429f4a4b179..9a820f26dd192ca790ebaceb8d05c7605a318f1b 100644 (file)
--- a/src/parser/tptp/tptp_input.h
+++ b/src/parser/tptp/tptp_input.h
@@ -82,7 +82,7 @@ class TptpInput : public AntlrInput {
    *
    * @throws ParserException if an error is encountered during parsing.
    */
-  Expr parseExpr();
+  Expr parseExpr() override;
 
 };/* class TptpInput */
 

diff --git a/src/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h
index 32c6bae42be549e7675bbbafac6bccd6f5cea17d..ac0435442b78bfe9f35b427e9894c0e62a924173 100644 (file)
--- a/src/theory/booleans/type_enumerator.h
+++ b/src/theory/booleans/type_enumerator.h
@@ -38,7 +38,7 @@ class BooleanEnumerator : public TypeEnumeratorBase<BooleanEnumerator> {
            type.getConst<TypeConstant>() == BOOLEAN_TYPE);
   }
 
-  Node operator*() {
+  Node operator*() override {
     switch(d_value) {
     case FALSE:
       return NodeManager::currentNM()->mkConst(false);

diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h
index 0ae6462bcbe9751434ee0a139d3dc4f2fc1b1022..4b243c224ceb93d71652a0f8e5a7a18e792f0e70 100644 (file)
--- a/src/theory/fp/type_enumerator.h
+++ b/src/theory/fp/type_enumerator.h
@@ -48,7 +48,7 @@ class FloatingPointEnumerator
     return NodeManager::currentNM()->mkConst(createFP());
   }
 
-  FloatingPointEnumerator& operator++() {
+  FloatingPointEnumerator& operator++() override {
     const FloatingPoint current(createFP());
     if (current.isNaN()) {
       d_enumerationComplete = true;
@@ -92,7 +92,7 @@ class RoundingModeEnumerator
     return NodeManager::currentNM()->mkConst(d_rm);
   }
 
-  RoundingModeEnumerator& operator++() {
+  RoundingModeEnumerator& operator++() override {
     switch (d_rm) {
       case roundNearestTiesToEven:
         d_rm = roundTowardPositive;

diff --git a/src/theory/quantifiers/ho_trigger.h b/src/theory/quantifiers/ho_trigger.h
index 4db3a660fce9be3c1e892ba2e491b903ba4247bc..87f7fe07f8e7255774ebce5f565252801398b0d4 100644 (file)
--- a/src/theory/quantifiers/ho_trigger.h
+++ b/src/theory/quantifiers/ho_trigger.h
@@ -167,7 +167,7 @@ class HigherOrderTrigger : public Trigger
   * matching ground terms to function applications with variable heads.
   * See examples (EX1)-(EX3) above.
   */
-  virtual bool sendInstantiation(InstMatch& m);
+  bool sendInstantiation(InstMatch& m) override;
 
  private:
   //-------------------- current information about the match

diff --git a/src/theory/quantifiers/quant_conflict_find.cpp b/src/theory/quantifiers/quant_conflict_find.cpp
index 95f8e30931f5311e1ecbe4073424197cd49ad1e9..23e2ad721e60c2c13243679e0635ce9673872031 100644 (file)
--- a/src/theory/quantifiers/quant_conflict_find.cpp
+++ b/src/theory/quantifiers/quant_conflict_find.cpp
@@ -34,7 +34,7 @@ namespace CVC4 {
 namespace theory {
 namespace quantifiers {
 
-QuantInfo::QuantInfo() : d_unassigned_nvar(0), d_mg(NULL), d_una_index(0) {}
+QuantInfo::QuantInfo() : d_unassigned_nvar(0), d_una_index(0), d_mg(nullptr) {}
 
 QuantInfo::~QuantInfo() {
   delete d_mg;