Replace include guard ifdef/define with pragma once

modules/bindbackend/bindbackend2.hh

@@ -19,10 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-
-#ifndef PDNS_BINDBACKEND_HH
-#define PDNS_BINDBACKEND_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include <set>
@@ -317,5 +314,3 @@ private:
   static void doEmptyNonTerminals(std::shared_ptr<recordstorage_t>& records, const DNSName& zoneName, bool nsec3zone, NSEC3PARAMRecordContent ns3pr);
   void loadConfig(string *status=nullptr);
 };
-
-#endif /* PDNS_BINDBACKEND_HH */

modules/geoipbackend/geoipbackend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_GEOIPBACKEND_HH
-#define PDNS_GEOIPBACKEND_HH
-
+#pragma once
 #include "pdns/namespaces.hh"
 
 #include <vector>
@@ -79,5 +77,3 @@ private:
   vector<DNSResourceRecord> d_result;
   vector<GeoIPInterface> d_files;
 };
-
-#endif /* PDNS_GEOIPBACKEND_HH */

modules/geoipbackend/geoipinterface.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_GEOIPINTERFACE_HH
-#define PDNS_GEOIPINTERFACE_HH
-
+#pragma once
 #include "boost/optional.hpp"
 
 #include "geoipbackend.hh"
@@ -67,5 +65,3 @@ private:
   static unique_ptr<GeoIPInterface> makeMMDBInterface(const string &fname, const map<string, string>& opts);
   static unique_ptr<GeoIPInterface> makeDATInterface(const string& fname, const map<string, string>& opts);
 };
-
-#endif

modules/gmysqlbackend/gmysqlbackend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_GMYSQLBACKEND_HH
-#define PDNS_GMYSQLBACKEND_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include "pdns/backends/gsql/gsqlbackend.hh"
@@ -37,5 +35,3 @@ public:
 protected:
   void reconnect() override;
 };
-
-#endif /* PDNS_GMYSQLBACKEND_HH */

modules/gmysqlbackend/smysql.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef SMYSQL_HH
-#define SMYSQL_HH
-
+#pragma once
 #include <mysql.h>
 #include "pdns/backends/gsql/ssql.hh"
 #include "pdns/utility.hh"
@@ -65,5 +63,3 @@ private:
   bool d_threadCleanup;
   bool d_clientSSL;
 };
-
-#endif /* SSMYSQL_HH */

modules/godbcbackend/godbcbackend.hh

@@ -19,6 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#pragma once
 #include <string>
 #include "pdns/backends/gsql/gsqlbackend.hh"
 
@@ -29,4 +30,3 @@ public:
   gODBCBackend( const std::string & mode, const std::string & suffix );
 
 };
-

modules/godbcbackend/sodbc.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef SODBC_HH
-#define SODBC_HH
-
+#pragma once
 #include <string>
 #include <vector>
 
@@ -75,6 +73,3 @@ public:
   SSqlException sPerrorException( const std::string & reason ) override;
 
 };
-
-
-#endif // SODBC_HH

modules/gpgsqlbackend/gpgsqlbackend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_GPGSQLBACKEND_HH
-#define PDNS_GPGSQLBACKEND_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include "pdns/backends/gsql/gsqlbackend.hh"
@@ -38,5 +36,3 @@ protected:
   void reconnect() override;
   bool inTransaction() override;
 };
-
-#endif /* PDNS_GPGSQLBACKEND_HH */

modules/gpgsqlbackend/spgsql.hh

@@ -19,8 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef SPGSQL_HH
-#define SPGSQL_HH
+#pragma once
 #include "pdns/namespaces.hh"
 #include "pdns/backends/gsql/ssql.hh"
 
@@ -56,5 +55,3 @@ private:
   static bool s_dolog;
   bool d_in_trx;
 };
-
-#endif /* SPGSQL_HH */

modules/gsqlite3backend/gsqlite3backend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef GSQLITEBACKEND_HH
-#define GSQLITEBACKEND_HH
-
+#pragma once
 #include <string>
 #include "pdns/backends/gsql/gsqlbackend.hh"
 
@@ -32,5 +30,3 @@ public:
   //! Constructs the backend, throws an exception if it failed..
   gSQLite3Backend( const std::string & mode, const std::string & suffix );
 };
-
-#endif // GSQLITEBACKEND_HH

modules/lua2backend/lua2api2.hh

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
-#ifndef LUA2API_2_HH
-#define LUA2API_2_HH 1
-
 #include "boost/lexical_cast.hpp"
 #include "boost/algorithm/string/join.hpp"
 #include "pdns/arguments.hh"
@@ -418,5 +415,3 @@ private:
 
   deinit_call_t f_deinit;
 };
-
-#endif

modules/lua2backend/lua2backend.hh

@@ -20,11 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
-#ifndef LUA2BACKEND_HH
-#define LUA2BACKEND_HH 1
-
 #include "pdns/dnsbackend.hh"
 #include "pdns/lua-auth4.hh"
 #include "lua2api2.hh"
-
-#endif

modules/pipebackend/coprocess.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_COPROCESS_HH
-#define PDNS_COPROCESS_HH
-
+#pragma once
 #include <iostream>
 #include <stdio.h>
 #include <string>
@@ -72,4 +70,3 @@ private:
   FILE *d_fp;
 };
 bool isUnixSocket(const string& fname);
-#endif

modules/pipebackend/pipebackend.hh

@@ -19,14 +19,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PIPEBACKEND_HH
-#define PIPEBACKEND_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include <sys/types.h>
 
-
 #include "pdns/namespaces.hh"
 #include "pdns/misc.hh"
 
@@ -70,7 +67,3 @@ private:
   bool d_disavow;
   int d_abiVersion;
 };
-
-
-#endif
-

modules/remotebackend/remotebackend.hh

@@ -19,8 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef REMOTEBACKEND_REMOTEBACKEND_HH
-
+#pragma once
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -228,4 +227,3 @@ class RemoteBackend : public DNSBackend
 
     void parseDomainInfo(const json11::Json &obj, DomainInfo &di);
 };
-#endif

modules/tinydnsbackend/tinydnsbackend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef TINYDNSBACKEND_HH
-#define TINYDNSBACKEND_HH
-
+#pragma once
 #include "pdns/dnsbackend.hh"
 #include "pdns/logger.hh"
 #include "pdns/iputils.hh"
@@ -108,5 +106,3 @@ private:
   static TDI_suffix_t s_domainInfo;
   static uint32_t s_lastId; // used to give a domain an id.
 };
-
-#endif // TINYDNSBACKEND_HH

pdns/anadns.hh

@@ -19,8 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_ANADNS_HH
-#define PDNS_ANADNS_HH
+#pragma once
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <string>
@@ -83,6 +82,3 @@ inline ostream& operator<<(ostream &s, const QuestionIdentifier& qi)
   s<<" to " << qi.d_dest.toStringWithPort();
   return s;
 }
-
-
-#endif

pdns/arguments.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef ARGUMENTS_HH
-#define ARGUMENTS_HH
-
+#pragma once
 #include <map>
 #include <set>
 #include <string>
@@ -129,5 +127,3 @@ private:
 };
 
 extern ArgvMap &arg();
-
-#endif /* ARGUMENTS_HH */

pdns/auth-caches.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef AUTH_CACHES_HH
-#define AUTH_CACHES_HH
-
+#pragma once
 #include <string>
 #include <cstdint>
 
@@ -30,5 +28,3 @@
 uint64_t purgeAuthCaches(); /* empty all caches */
 uint64_t purgeAuthCaches(const std::string& match); /* remove specific entries from all caches, can be $ terminated */
 uint64_t purgeAuthCachesExact(const DNSName& qname); /* remove specific entries from all caches, no wildcard matching */
-
-#endif /* AUTH_CACHES_HH */

pdns/auth-packetcache.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef AUTH_PACKETCACHE_HH
-#define AUTH_PACKETCACHE_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include "dns.hh"
@@ -148,5 +146,3 @@ private:
 
   static const unsigned int s_mincleaninterval=1000, s_maxcleaninterval=300000;
 };
-
-#endif /* AUTH_PACKETCACHE_HH */

pdns/auth-querycache.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef AUTH_QUERYCACHE_HH
-#define AUTH_QUERYCACHE_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include "dns.hh"
@@ -129,5 +127,3 @@ private:
 
   static const unsigned int s_mincleaninterval=1000, s_maxcleaninterval=300000;
 };
-
-#endif /* AUTH_QUERYCACHE_HH */

pdns/backends/gsql/gsqlbackend.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_GSQLBACKEND_HH
-#define PDNS_GSQLBACKEND_HH
-
+#pragma once
 #include <string>
 #include <map>
 #include "ssql.hh"
@@ -411,5 +409,3 @@ protected:
   bool d_dnssecQueries;
   bool d_inTransaction{false};
 };
-
-#endif /* PDNS_GSQLBACKEND_HH */

pdns/backends/gsql/ssql.hh

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef SSQL_HH
-#define SSQL_HH
-
+#pragma once
 #include <string>
 #include <vector>
 #include <inttypes.h>
@@ -88,5 +86,3 @@ public:
   virtual void reconnect() {};
   virtual ~SSql(){};
 };
-
-#endif /* SSQL_HH */

pdns/base32.hh

@@ -19,11 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef PDNS_BASE32_HH
-#define PDNS_BASE32_HH
+#pragma once
 #include <string>
 
 std::string toBase32Hex(const std::string& input);
 std::string fromBase32Hex(const std::string& input);
-
-#endif