Merge pull request #162 from sparkprime/overloads

Enable -Woverloaded-virtual and fix resulting warnings
google · Apr 22, 2016 · ef3fef8 · ef3fef8
2 parents 8025a01 + a1bda24
commit ef3fef8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ OD ?= od
 
 OPT ?= -O3
 
-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c++0x -fPIC -Iinclude
+CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude
 CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude
 EMCXXFLAGS = $(CXXFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0
 EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0

diff --git a/core/formatter.cpp b/core/formatter.cpp
@@ -951,7 +951,7 @@ class Pass {
         }
     }
 
-    virtual void file(AST *body, Fodder &final_fodder)
+    virtual void file(AST *&body, Fodder &final_fodder)
     {
         expr(body);
         fodder(final_fodder);
@@ -960,6 +960,7 @@ class Pass {
 
 
 class EnforceStringStyle : public Pass {
+    using Pass::visit;
     public:
     EnforceStringStyle(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }
     void visit(LiteralString *lit)
@@ -1108,6 +1109,7 @@ bool contains_newline(const Fodder &fodder)
 
 /* Commas should appear at the end of an object/array only if the closing token is on a new line. */
 class FixTrailingCommas : public Pass {
+    using Pass::visit;
     public:
     FixTrailingCommas(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }
     Fodder comments;
@@ -1182,6 +1184,7 @@ class FixTrailingCommas : public Pass {
 
 /* Remove nested parens. */
 class FixParens : public Pass {
+    using Pass::visit;
     public:
     FixParens(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }
     void visit(Parens *expr)
@@ -1200,6 +1203,7 @@ class FixParens : public Pass {
 
 /* Ensure ApplyBrace syntax sugar is used in the case of A + { }. */
 class FixPlusObject : public Pass {
+    using Pass::visit;
     public:
     FixPlusObject(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }
     void visitExpr(AST *&expr)
@@ -1225,6 +1229,7 @@ class FixPlusObject : public Pass {
 
 /* Remove final colon in slices. */
 class NoRedundantSliceColon : public Pass {
+    using Pass::visit;
     public:
     NoRedundantSliceColon(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }
 
@@ -1243,6 +1248,7 @@ class NoRedundantSliceColon : public Pass {
 
 /* Ensure syntax sugar is used where possible. */
 class PrettyFieldNames : public Pass {
+    using Pass::visit;
     public:
     PrettyFieldNames(Allocator &alloc, const FmtOpts &opts) : Pass(alloc, opts) { }