From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 16 Nov 2015 11:15:25 +0000 (+0100)
Subject: Fix inconsistent override usage in dnsrecords.hh
X-Git-Tag: dnsdist-1.0.0-alpha1~220^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cca142e7ce6b60d21a2d3a21649aa09f4bbc67a;p=pdns

Fix inconsistent override usage in dnsrecords.hh

Fixes warnings on clang.
---

diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index b396fc05f..0e035e509 100644
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -37,10 +37,10 @@
   static void unreport(void);                                                                    \
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);                          \
   static DNSRecordContent* make(const string& zonedata);                                         \
-  string getZoneRepresentation() const;                                                          \
-  void toPacket(DNSPacketWriter& pw);                                                            \
+  string getZoneRepresentation() const override;                                                 \
+  void toPacket(DNSPacketWriter& pw) override;                                                   \
   uint16_t getType() const override { return QType::RNAME; }                                   \
-  template<class Convertor> void xfrPacket(Convertor& conv);                             
+  template<class Convertor> void xfrPacket(Convertor& conv);
 
 class NAPTRRecordContent : public DNSRecordContent
 {
@@ -452,8 +452,8 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const;
-  void toPacket(DNSPacketWriter& pw);
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override
   {
     return QType::NSEC;
@@ -467,14 +467,14 @@ class NSEC3RecordContent : public DNSRecordContent
 {
 public:
   static void report(void);
-  NSEC3RecordContent() 
+  NSEC3RecordContent()
   {}
   NSEC3RecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone?
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const;
-  void toPacket(DNSPacketWriter& pw);
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
 
   uint8_t d_algorithm, d_flags;
   uint16_t d_iterations;
@@ -504,8 +504,8 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const;
-  void toPacket(DNSPacketWriter& pw);
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
 
   uint16_t getType() const override
   {
@@ -524,14 +524,14 @@ class LOCRecordContent : public DNSRecordContent
 {
 public:
   static void report(void);
-  LOCRecordContent() 
+  LOCRecordContent()
   {}
   LOCRecordContent(const string& content, const string& zone="");
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const;
-  void toPacket(DNSPacketWriter& pw);
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
 
   uint8_t d_version, d_size, d_horizpre, d_vertpre;
   uint32_t d_latitude, d_longitude, d_altitude;
@@ -554,8 +554,8 @@ public:
 
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& content);
-  string getZoneRepresentation() const;
-  void toPacket(DNSPacketWriter& pw);
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
 
   uint32_t d_ip;
   std::bitset<65535> d_services;
@@ -569,8 +569,8 @@ public:
   static void report(void);
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
-  void toPacket(DNSPacketWriter& pw);
-  string getZoneRepresentation() const;
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override { return QType::EUI48; }
 private:
  // storage for the bytes
@@ -584,8 +584,8 @@ public:
   static void report(void);
   static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr);
   static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone?
-  void toPacket(DNSPacketWriter& pw);
-  string getZoneRepresentation() const;
+  string getZoneRepresentation() const override;
+  void toPacket(DNSPacketWriter& pw) override;
   uint16_t getType() const override { return QType::EUI64; }
 private:
  // storage for the bytes