[master] Fixed db_lost_callback default to NULL build issue

    Replaced = NULL with = 0 in dhcpsrv header files altered for 5477.

diff --git a/src/lib/dhcpsrv/cfg_db_access.h b/src/lib/dhcpsrv/cfg_db_access.h
index 845535d646ce1d68e2fac2b9cda0f9087ddf1966..d0c2c9bc38665a970d9ab14b41a1e6b8d850d873 100644 (file)
--- a/src/lib/dhcpsrv/cfg_db_access.h
+++ b/src/lib/dhcpsrv/cfg_db_access.h
@@ -68,7 +68,7 @@ public:
     /// @param db_lost_callback function to invoke if connectivity to
     /// either the lease or host managers, once established, is subsequently
     /// lost.
-    void createManagers(DatabaseConnection::DbLostCallback db_lost_callback = NULL) const;
+    void createManagers(DatabaseConnection::DbLostCallback db_lost_callback = 0) const;
 
     /// @brief Unparse an access string
     ///

diff --git a/src/lib/dhcpsrv/database_connection.h b/src/lib/dhcpsrv/database_connection.h
index 7f89ad2edb17c47cb8e4adb27ccfd30b6a77259b..53dbec04d7a7d82800b88089490b14393b44a3c7 100644 (file)
--- a/src/lib/dhcpsrv/database_connection.h
+++ b/src/lib/dhcpsrv/database_connection.h
@@ -150,7 +150,7 @@ public:
     /// @param db_lost_callback  Optional call back function to invoke if a
     ///        successfully open connection subsequently fails
     DatabaseConnection(const ParameterMap& parameters,
-        DbLostCallback db_lost_callback = NULL)
+        DbLostCallback db_lost_callback = 0)
         :parameters_(parameters), db_lost_callback_(db_lost_callback) {
     }
 

diff --git a/src/lib/dhcpsrv/host_data_source_factory.h b/src/lib/dhcpsrv/host_data_source_factory.h
index b941aa730d6c7150b589440df8913d40154acc78..1532e16a0604d130e67f7eb78cb0f417c65b8b8d 100644 (file)
--- a/src/lib/dhcpsrv/host_data_source_factory.h
+++ b/src/lib/dhcpsrv/host_data_source_factory.h
@@ -67,7 +67,7 @@ public:
     /// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not
     ///        identify a supported backend.
     static void create(const std::string& dbaccess,
-                       DatabaseConnection::DbLostCallback db_lost_callback = NULL);
+                       DatabaseConnection::DbLostCallback db_lost_callback = 0);
 
     /// @brief Destroy host data source
     ///

diff --git a/src/lib/dhcpsrv/host_mgr.h b/src/lib/dhcpsrv/host_mgr.h
index 7cef82e7b8227ccbcfc0eeb67de619df926c9390..e288c266830480f4d5769b785b1a8ce1c65eb30c 100644 (file)
--- a/src/lib/dhcpsrv/host_mgr.h
+++ b/src/lib/dhcpsrv/host_mgr.h
@@ -73,7 +73,7 @@ public:
     /// @param db_lost_callback function to invoke if connectivity to
     /// the host database is lost.
     static void create(const std::string& access = "",
-                       DatabaseConnection::DbLostCallback db_lost_callback = NULL);
+                       DatabaseConnection::DbLostCallback db_lost_callback = 0);
 
     /// @brief Returns a sole instance of the @c HostMgr.
     ///

diff --git a/src/lib/dhcpsrv/lease_mgr_factory.h b/src/lib/dhcpsrv/lease_mgr_factory.h
index 83fd6017fd35e6469bdd5eac16b7a090947128ff..7d6d842bb70a3bc32a17bb297cd18d1e3cdc5f51 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr_factory.h
+++ b/src/lib/dhcpsrv/lease_mgr_factory.h
@@ -71,7 +71,7 @@ public:
     /// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not
     ///        identify a supported backend.
     static void create(const std::string& dbaccess, 
-                       DatabaseConnection::DbLostCallback db_lost_callback = NULL);
+                       DatabaseConnection::DbLostCallback db_lost_callback = 0);
 
     /// @brief Destroy lease manager
     ///

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.h b/src/lib/dhcpsrv/pgsql_host_data_source.h
index 2b767a964c7a7c844105d5f3ec7a2d22d250f092..c2aebbd7f76147b4dd01af86d7542707d79a123b 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.h
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.h
@@ -61,7 +61,7 @@ public:
     /// @throw isc::dhcp::DbOperationError An operation on the open database has
     ///        failed.
     PgSqlHostDataSource(const DatabaseConnection::ParameterMap& parameters,
-                        DatabaseConnection::DbLostCallback db_lost_callback = NULL); 
+                        DatabaseConnection::DbLostCallback db_lost_callback = 0);
 
     /// @brief Virtual destructor.
     /// Frees database resources and closes the database connection through

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index 88cf2b1badb127d4856c624942b905ef24291b5d..4e2a91424b7ebb7d9a3639bd2fe550c085285650 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -59,7 +59,7 @@ public:
     /// @throw isc::dhcp::DbOperationError An operation on the open database has
     ///        failed.
     PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters,
-                  DatabaseConnection::DbLostCallback db_lost_callback = NULL);
+                  DatabaseConnection::DbLostCallback db_lost_callback = 0);
 
     /// @brief Destructor (closes database)
     virtual ~PgSqlLeaseMgr();