From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Thu, 2 Mar 2006 21:21:16 +0000 (+0000)
Subject: g++ 4.1 fixes (all trivial), copyright update
X-Git-Tag: pdns-2.9.20~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4b10f738004d8b15c88d5cdcf3f601311c08c9;p=thirdparty%2Fpdns.git

g++ 4.1 fixes (all trivial), copyright update


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@568 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 9ecdacf8d0..d30ed1535c 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -1,11 +1,10 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002  PowerDNS.COM BV
+    Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2 as published 
+    by the Free Software Foundation
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,8 +20,6 @@
 
 #include "arguments.hh"
 
-
-
 const ArgvMap::param_t::const_iterator ArgvMap::begin()
 {
   return params.begin();
diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index 12cc8cce7c..6b77f85682 100644
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -77,8 +77,8 @@ public:
   {
     parse(argc,argv,true);
   }
-  void ArgvMap::preParse(int &argc, char **argv, const string &arg); //!< use this to preparse a single var
-  bool ArgvMap::preParseFile(const char *fname, const string &arg); //!< use this to preparse a single var in configuration
+  void preParse(int &argc, char **argv, const string &arg); //!< use this to preparse a single var
+  bool preParseFile(const char *fname, const string &arg); //!< use this to preparse a single var in configuration
 
   bool file(const char *fname, bool lax=false); //!< Parses a file with parameters
   bool laxFile(const char *fname) 
diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh
index 8b52b98eee..68a1c98973 100644
--- a/pdns/packetcache.hh
+++ b/pdns/packetcache.hh
@@ -63,7 +63,7 @@ class PacketCache
 public:
   PacketCache();
   void insert(DNSPacket *q, DNSPacket *r);  //!< We copy the contents of *p into our cache. Do not needlessly call this to insert questions already in the cache as it wastes resources
-  void PacketCache::insert(const char *packet, int length);
+  void insert(const char *packet, int length);
 
   inline int get(DNSPacket *p, DNSPacket *q); //!< We return a dynamically allocated copy out of our cache. You need to delete it. You also need to spoof in the right ID with the DNSPacket.spoofID() method.
   bool getKey(const string &key, string &content);
diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh
index 6a9a148f8e..5c780b7787 100644
--- a/pdns/packethandler.hh
+++ b/pdns/packethandler.hh
@@ -82,7 +82,7 @@ public:
 private:
   int processNotify(DNSPacket *);
   void addRootReferral(DNSPacket *r);
-  int PacketHandler::trySuperMaster(DNSPacket *p);
+  int trySuperMaster(DNSPacket *p);
   int makeCanonic(DNSPacket *p, DNSPacket *r, string &target);
   int doWildcardRecords(DNSPacket *p, DNSPacket *r, string &target);
   int findMboxFW(DNSPacket *p, DNSPacket *r, string &target);
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 53137b5a32..c558952e45 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2005  PowerDNS.COM BV
+    Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 as published by
@@ -572,7 +572,7 @@ int main(int argc, char **argv)
   declareStats();
   DLOG(L<<Logger::Warning<<"Verbose logging in effect"<<endl);
   
-  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2005 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
+  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2006 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
 #ifdef __GNUC__
   L<<", gcc "__VERSION__;
 #endif // add other compilers here
diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index 09633d97c9..4e36bdc016 100644
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -120,7 +120,7 @@ public:
 
   static DNSBackend *maker(const map<string,string> &);
   static void closeDynListener();
-  static void UeberBackend::setStatus(const string &st);
+  static void setStatus(const string &st);
   void getUnfreshSlaveInfos(vector<DomainInfo>* domains);
   void getUpdatedMasters(vector<DomainInfo>* domains);
   bool getDomainInfo(const string &domain, DomainInfo &di);