Use 'override' where appropriate

AISConnect.h

@@ -56,9 +56,9 @@ class AISConnect : public Connect {
     AISConnect(const string &name) throw(AISDatabaseReadFailed);
     AISConnect(const string &name, const string &ais_db) throw(AISDatabaseReadFailed);
 
-    virtual ~AISConnect();
+    ~AISConnect() override;
 
-    virtual void request_das(DAS &das);
+    void request_das(DAS &das) override;
 };
 
 } // namespace libdap

Array.h

@@ -227,7 +227,7 @@ class Array : public Vector {
     Array(const string &n, BaseType *v, bool is_dap4 = false);
     Array(const string &n, const string &d, BaseType *v, bool is_dap4 = false);
     Array(const Array &rhs);
-    virtual ~Array();
+    ~Array() override;
 
     Array &operator=(const Array &rhs);
     BaseType *ptr_duplicate() override;

AttrTable.h

@@ -283,7 +283,7 @@ class AttrTable : public DapObj {
 public:
     AttrTable();
     AttrTable(const AttrTable &rhs);
-    virtual ~AttrTable();
+    ~AttrTable() override;
     AttrTable &operator=(const AttrTable &rhs);
 
     virtual void erase();

Byte.h

@@ -64,7 +64,7 @@ class Byte : public BaseType {
     Byte(const string &n);
     Byte(const string &n, const string &d);
 
-    virtual ~Byte() {}
+    ~Byte() override {}
 
     Byte(const Byte &copy_from);
 

D4Attributes.h

@@ -65,7 +65,7 @@ class D4Attribute : public DapObj {
     D4Attribute(const string &name, D4AttributeType type) : d_name(name), d_type(type), d_attributes(0) {}
 
     D4Attribute(const D4Attribute &src);
-    ~D4Attribute();
+    ~D4Attribute() override;
     D4Attribute &operator=(const D4Attribute &rhs);
 
     string name() const { return d_name; }
@@ -116,7 +116,7 @@ class D4Attributes : public DapObj {
     D4Attributes() {}
     D4Attributes(const D4Attributes &rhs) { m_duplicate(rhs); }
 
-    virtual ~D4Attributes() {
+    ~D4Attributes() override {
         D4AttributesIter i = d_attrs.begin();
         while (i != d_attrs.end()) {
             delete *i++;

D4BaseTypeFactory.h

@@ -71,42 +71,42 @@ class BaseType;
 class D4BaseTypeFactory : public BaseTypeFactory {
 public:
     D4BaseTypeFactory() {}
-    virtual ~D4BaseTypeFactory() {}
+    ~D4BaseTypeFactory() override {}
 
-    virtual BaseType *NewVariable(Type t, const string &name) const;
+    BaseType *NewVariable(Type t, const string &name) const override;
 
-    virtual BaseTypeFactory *ptr_duplicate() const { return new D4BaseTypeFactory; }
+    BaseTypeFactory *ptr_duplicate() const override { return new D4BaseTypeFactory; }
 
-    virtual Byte *NewByte(const string &n = "") const;
+    Byte *NewByte(const string &n = "") const override;
 
     // The Int8 types are new for DAP4
     virtual Int8 *NewInt8(const string &n = "") const;
     virtual Byte *NewChar(const string &n = "") const;
     virtual Byte *NewUInt8(const string &n = "") const;
 
-    virtual Int16 *NewInt16(const string &n = "") const;
-    virtual UInt16 *NewUInt16(const string &n = "") const;
-    virtual Int32 *NewInt32(const string &n = "") const;
-    virtual UInt32 *NewUInt32(const string &n = "") const;
+    Int16 *NewInt16(const string &n = "") const override;
+    UInt16 *NewUInt16(const string &n = "") const override;
+    Int32 *NewInt32(const string &n = "") const override;
+    UInt32 *NewUInt32(const string &n = "") const override;
 
     // New for DAP4
     virtual Int64 *NewInt64(const string &n = "") const;
     virtual UInt64 *NewUInt64(const string &n = "") const;
 
-    virtual Float32 *NewFloat32(const string &n = "") const;
-    virtual Float64 *NewFloat64(const string &n = "") const;
+    Float32 *NewFloat32(const string &n = "") const override;
+    Float64 *NewFloat64(const string &n = "") const override;
 
     virtual D4Enum *NewEnum(const string &n = "", Type type = dods_null_c) const;
 
-    virtual Str *NewStr(const string &n = "") const;
-    virtual Url *NewUrl(const string &n = "") const;
+    Str *NewStr(const string &n = "") const override;
+    Url *NewUrl(const string &n = "") const override;
     virtual Url *NewURL(const string &n = "") const;
 
     virtual D4Opaque *NewOpaque(const string &n = "") const;
 
-    virtual Array *NewArray(const string &n = "", BaseType *v = 0) const;
+    Array *NewArray(const string &n = "", BaseType *v = 0) const override;
 
-    virtual Structure *NewStructure(const string &n = "") const;
+    Structure *NewStructure(const string &n = "") const override;
     virtual D4Sequence *NewD4Sequence(const string &n = "") const;
 
     virtual D4Group *NewGroup(const string &n = "") const;

D4Enum.h

@@ -107,7 +107,7 @@ class D4Enum : public BaseType {
         return *this;
     }
 
-    virtual ~D4Enum() {}
+    ~D4Enum() override {}
 
     virtual D4EnumDef *enumeration() const { return d_enum_def; }
     virtual void set_enumeration(D4EnumDef *enum_def);

D4Group.h

@@ -73,7 +73,7 @@ class D4Group : public Constructor {
     D4Group(const string &name, const string &dataset);
 
     D4Group(const D4Group &rhs);
-    virtual ~D4Group();
+    ~D4Group() override;
 
     D4Group &operator=(const D4Group &rhs);
 

D4Sequence.h

@@ -170,7 +170,7 @@ class D4Sequence : public Constructor {
 
     D4Sequence(const D4Sequence &rhs);
 
-    virtual ~D4Sequence();
+    ~D4Sequence() override;
 
     D4Sequence &operator=(const D4Sequence &rhs);
 

D4StreamUnMarshaller.h

@@ -87,7 +87,7 @@ class D4StreamUnMarshaller : public UnMarshaller {
 public:
     D4StreamUnMarshaller(istream &in, bool twiddle_bytes);
     D4StreamUnMarshaller(istream &in);
-    virtual ~D4StreamUnMarshaller();
+    ~D4StreamUnMarshaller() override;
 
     void set_twiddle_bytes(bool twiddle) { d_twiddle_bytes = twiddle; }
 

DAS.h

@@ -136,7 +136,7 @@ class DAS : public DapObj {
     DAS() : DapObj(), d_container(0) {}
     DAS(const DAS &das) { duplicate(das); }
 
-    virtual ~DAS() {}
+    ~DAS() override {}
 
     DAS &operator=(const DAS &rhs);
 

DDS.h

@@ -215,7 +215,7 @@ class DDS : public DapObj {
     DDS(BaseTypeFactory *factory, const string &name, const string &version);
     DDS(const DDS &dds);
 
-    virtual ~DDS();
+    ~DDS() override;
 
     DDS &operator=(const DDS &rhs);
 

DataDDS.h

@@ -91,7 +91,7 @@ class DataDDS : public DDS {
     // #ifdef DEFAULT_BASETYPE_FACTORY
     // DataDDS(const string &n = "", const string &v = "");
     // #endif
-    virtual ~DataDDS() {}
+    ~DataDDS() override {}
 
     /** Sets the version string.  This typically looks something like:
     <tt>DODS/2.15</tt>, where ``2'' is the major version number, and ``15''

Float32.h

@@ -68,7 +68,7 @@ class Float32 : public BaseType {
 
     Float32 &operator=(const Float32 &rhs);
 
-    virtual ~Float32() {}
+    ~Float32() override {}
 
     BaseType *ptr_duplicate() override;
 

Float64.h

@@ -62,7 +62,7 @@ class Float64 : public BaseType {
 public:
     Float64(const string &n);
     Float64(const string &n, const string &d);
-    virtual ~Float64() {}
+    ~Float64() override {}
 
     Float64(const Float64 &copy_from);
 

Grid.h

@@ -130,7 +130,7 @@ class Grid : public Constructor {
     Grid(const string &n);
     Grid(const string &n, const string &d);
     Grid(const Grid &rhs);
-    virtual ~Grid();
+    ~Grid() override;
 
     typedef std::vector<BaseType *>::const_iterator Map_citer;
     typedef std::vector<BaseType *>::iterator Map_iter;

Int16.h

@@ -61,7 +61,7 @@ class Int16 : public BaseType {
 public:
     Int16(const string &n);
     Int16(const string &n, const string &d);
-    virtual ~Int16() {}
+    ~Int16() override {}
 
     Int16(const Int16 &copy_from);
 

Int32.h

@@ -72,7 +72,7 @@ class Int32 : public BaseType {
 
     Int32 &operator=(const Int32 &rhs);
 
-    virtual ~Int32();
+    ~Int32() override;
 
     BaseType *ptr_duplicate() override;
 

Int64.h

@@ -67,7 +67,7 @@ class Int64 : public BaseType {
 
     Int64 &operator=(const Int64 &rhs);
 
-    virtual ~Int64();
+    ~Int64() override;
 
     BaseType *ptr_duplicate() override;
 

Int8.h

@@ -57,7 +57,7 @@ class Int8 : public BaseType {
 public:
     Int8(const string &n);
     Int8(const string &n, const string &d);
-    virtual ~Int8() {}
+    ~Int8() override {}
 
     Int8(const Int8 &copy_from);
 

Makefile.am

@@ -10,7 +10,7 @@ aclocaldir=$(datadir)/aclocal
 pkgconfigdir=$(libdir)/pkgconfig
 
 AM_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl -I$(top_srcdir)/GNU -I$(top_srcdir)/http_dap $(XML2_CFLAGS) $(TIRPC_CFLAGS)
-AM_CXXFLAGS = $(CXX_STD_FLAG) -Wall -W -Wcast-align -Wno-deprecated-register -Wno-inconsistent-missing-override
+AM_CXXFLAGS = $(CXX_STD_FLAG) -Wall -W -Wcast-align -Wno-deprecated-register
 
 CXXFLAGS_DEBUG = -g3 -O0
 

StdinResponse.h

@@ -65,13 +65,13 @@ class StdinResponse : public Response {
     StdinResponse(std::istream &in) : Response(), d_stdin(0), d_cin(&in) {}
 
     /** Destructor. Does not close standard input. */
-    virtual ~StdinResponse() {}
+    ~StdinResponse() override {}
 
-    virtual FILE *get_stream() const { return d_stdin; }
-    virtual void set_stream(FILE *s) { d_stdin = s; }
+    FILE *get_stream() const override { return d_stdin; }
+    void set_stream(FILE *s) override { d_stdin = s; }
 
-    virtual std::istream *get_cpp_stream() const { return d_cin; }
-    virtual void set_cpp_stream(std::istream *in) { d_cin = in; }
+    std::istream *get_cpp_stream() const override { return d_cin; }
+    void set_cpp_stream(std::istream *in) override { d_cin = in; }
 };
 
 } // namespace libdap

Str.h

@@ -66,7 +66,7 @@ class Str : public BaseType {
     Str(const string &n);
     Str(const string &n, const string &d);
 
-    virtual ~Str() {}
+    ~Str() override {}
 
     Str(const Str &copy_from);
 

Structure.h

@@ -87,7 +87,7 @@ class Structure : public Constructor {
     Structure(const string &n, const string &d);
 
     Structure(const Structure &rhs);
-    virtual ~Structure();
+    ~Structure() override;
 
     Structure &operator=(const Structure &rhs);
     BaseType *ptr_duplicate() override;

UInt16.h

@@ -59,7 +59,7 @@ class UInt16 : public BaseType {
 public:
     UInt16(const string &n);
     UInt16(const string &n, const string &d);
-    virtual ~UInt16() {}
+    ~UInt16() override {}
 
     UInt16(const UInt16 &copy_from);
 

UInt32.h

@@ -61,7 +61,7 @@ class UInt32 : public BaseType {
 public:
     UInt32(const string &n);
     UInt32(const string &n, const string &d);
-    virtual ~UInt32() {}
+    ~UInt32() override {}
 
     UInt32(const UInt32 &copy_from);
 

UInt64.h

@@ -61,7 +61,7 @@ class UInt64 : public BaseType {
 public:
     UInt64(const string &n);
     UInt64(const string &n, const string &d);
-    virtual ~UInt64() {}
+    ~UInt64() override {}
 
     UInt64(const UInt64 &copy_from);
 

Url.h

@@ -59,9 +59,9 @@ class Url : public Str {
     Url(const std::string &n, const std::string &d);
     Url(const std::string &n, Type t);
     Url(const std::string &n, const std::string &d, Type t);
-    virtual ~Url() {}
+    ~Url() override {}
 
-    virtual BaseType *ptr_duplicate();
+    BaseType *ptr_duplicate() override;
 };
 
 } // namespace libdap

Vector.h

@@ -128,7 +128,7 @@ class Vector : public BaseType {
     Vector(const string &n, const string &d, BaseType *v, const Type &t, bool is_dap4 = false);
     Vector(const Vector &rhs);
 
-    virtual ~Vector();
+    ~Vector() override;
 
     Vector &operator=(const Vector &rhs);
     // FIXME BaseType *ptr_duplicate() = 0 override;

XDRFileMarshaller.h

@@ -50,7 +50,7 @@ class XDRFileMarshaller : public Marshaller {
 
 public:
     XDRFileMarshaller(FILE *out);
-    virtual ~XDRFileMarshaller();
+    ~XDRFileMarshaller() override;
 
     void put_byte(dods_byte val) override;
 

XDRFileUnMarshaller.h

@@ -51,7 +51,7 @@ class XDRFileUnMarshaller : public UnMarshaller {
 
 public:
     XDRFileUnMarshaller(FILE *out);
-    virtual ~XDRFileUnMarshaller();
+    ~XDRFileUnMarshaller() override;
 
     void get_byte(dods_byte &val) override;
 

XDRStreamMarshaller.h

@@ -70,7 +70,7 @@ class XDRStreamMarshaller : public Marshaller {
 
 public:
     XDRStreamMarshaller(ostream &out); //, bool checksum = false, bool write_data = true) ;
-    virtual ~XDRStreamMarshaller();
+    ~XDRStreamMarshaller() override;
 
     void put_byte(dods_byte val) override;
 

XDRStreamUnMarshaller.h

@@ -62,7 +62,7 @@ class XDRStreamUnMarshaller : public UnMarshaller {
 
 public:
     XDRStreamUnMarshaller(istream &in);
-    virtual ~XDRStreamUnMarshaller();
+    ~XDRStreamUnMarshaller() override;
 
     void get_byte(dods_byte &val) override;
 

d4_ce/CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Basic CXX flags
-set(D4_CE_CXXFLAGS -Wall -Wcast-align -Wno-inconsistent-missing-override)
+set(D4_CE_CXXFLAGS -Wall -Wcast-align)
 
 if (BUILD_DEVELOPER)
     list(APPEND D4_CE_CXXFLAGS -g3 -O0)

d4_ce/Makefile.am

@@ -10,7 +10,7 @@ SUBDIRS = . unit-tests
 
 # Arrange to build with the backward compatibility mode enabled.
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/d4_ce $(XML2_CFLAGS) $(TIRPC_CFLAGS)
-AM_CXXFLAGS = -Wall -W -Wcast-align -Wno-inconsistent-missing-override
+AM_CXXFLAGS = -Wall -W -Wcast-align
 
 if COMPILER_IS_GCC
 AM_CXXFLAGS += -Wall -W -Wcast-align

d4_function/CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Basic compilation flags
-set(D4_FUNCTION_CXXFLAGS -Wall -Wcast-align -Wno-inconsistent-missing-override)
+set(D4_FUNCTION_CXXFLAGS -Wall -Wcast-align)
 
 if (BUILD_DEVELOPER)
     list(APPEND D4_FUNCTION_CXXFLAGS -g3 -O0)