From 5791c24cd68723c85c6a20ed45126c881ea583e5 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Fri, 15 Oct 2010 08:28:59 +0000 Subject: [PATCH] cleanup: removed meaningless 'explicit' for multi-param constructors. should be quite trivial, so I'm skipping explicit review. if someone could perform sanity check on the diff copied with this message that would be great. git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3224 e5f2f494-b856-4b98-b285-d166d9295462 --- src/lib/dns/gen-rdatacode.py.in | 2 +- src/lib/dns/name.h | 4 ++-- src/lib/dns/rdata/generic/mx_15.h | 2 +- src/lib/dns/rdata/generic/soa_6.h | 6 +++--- src/lib/dns/rrset.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in index 0bcc64b4f9..b154d4c7af 100755 --- a/src/lib/dns/gen-rdatacode.py.in +++ b/src/lib/dns/gen-rdatacode.py.in @@ -113,7 +113,7 @@ class MessageRenderer;\n\n''' if re.match('\s+// BEGIN_COMMON_MEMBERS$', line): content += ''' explicit ''' + type_utxt + '''(const std::string& type_str); - explicit ''' + type_utxt + '''(InputBuffer& buffer, size_t rdata_len); + ''' + type_utxt + '''(InputBuffer& buffer, size_t rdata_len); ''' + type_utxt + '''(const ''' + type_utxt + '''& other); virtual std::string toText() const; virtual void toWire(OutputBuffer& buffer) const; diff --git a/src/lib/dns/name.h b/src/lib/dns/name.h index 69eb75af1e..84ae2466e7 100644 --- a/src/lib/dns/name.h +++ b/src/lib/dns/name.h @@ -143,8 +143,8 @@ public: /// /// This constructor simply initializes the object in the straightforward /// way. - explicit NameComparisonResult(int order, unsigned int nlabels, - NameRelation relation) : + NameComparisonResult(int order, unsigned int nlabels, + NameRelation relation) : order_(order), nlabels_(nlabels), relation_(relation) {} //@} diff --git a/src/lib/dns/rdata/generic/mx_15.h b/src/lib/dns/rdata/generic/mx_15.h index c822709d42..50c8c98620 100644 --- a/src/lib/dns/rdata/generic/mx_15.h +++ b/src/lib/dns/rdata/generic/mx_15.h @@ -35,7 +35,7 @@ public: // BEGIN_COMMON_MEMBERS // END_COMMON_MEMBERS - explicit MX(uint16_t preference, const Name& mxname); + MX(uint16_t preference, const Name& mxname); /// /// Specialized methods diff --git a/src/lib/dns/rdata/generic/soa_6.h b/src/lib/dns/rdata/generic/soa_6.h index 573a47f3d4..fc847ff65d 100644 --- a/src/lib/dns/rdata/generic/soa_6.h +++ b/src/lib/dns/rdata/generic/soa_6.h @@ -33,9 +33,9 @@ public: // BEGIN_COMMON_MEMBERS // END_COMMON_MEMBERS - explicit SOA(const Name& mname, const Name& rname, uint32_t serial, - uint32_t refresh, uint32_t retry, uint32_t expire, - uint32_t minimum); + SOA(const Name& mname, const Name& rname, uint32_t serial, + uint32_t refresh, uint32_t retry, uint32_t expire, + uint32_t minimum); private: /// Note: this is a prototype version; we may reconsider /// this representation later. diff --git a/src/lib/dns/rrset.h b/src/lib/dns/rrset.h index f30a2d3acf..06a9050409 100644 --- a/src/lib/dns/rrset.h +++ b/src/lib/dns/rrset.h @@ -530,8 +530,8 @@ public: /// \param rrclass The RR class of the RRset. /// \param rrtype The RR type of the RRset. /// \param ttl The TTL of the RRset. - explicit BasicRRset(const Name& name, const RRClass& rrclass, - const RRType& rrtype, const RRTTL& ttl); + BasicRRset(const Name& name, const RRClass& rrclass, + const RRType& rrtype, const RRTTL& ttl); /// \brief The destructor. virtual ~BasicRRset(); //@} @@ -668,7 +668,7 @@ private: /// QNAME/QTYPE/QCLASS as a single object. class RRset : public BasicRRset { public: - explicit RRset(const Name& name, const RRClass& rrclass, + RRset(const Name& name, const RRClass& rrclass, const RRType& rrtype, const RRTTL& ttl); virtual ~RRset(); -- GitLab