summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2018-03-13 14:01:32 +0100
committerThomas Markwalder <tmark@isc.org>2018-03-13 14:01:32 +0100
commita5cb18b0b478c9b2832f35a47abddc7c9796474d (patch)
tree10a004659eafb7b4afcad6231a0d9dd21cf5cce8
parent[master] ChangeLog, AUTHORS updated after github70 merge. (diff)
downloadkea-a5cb18b0b478c9b2832f35a47abddc7c9796474d.tar.xz
kea-a5cb18b0b478c9b2832f35a47abddc7c9796474d.zip
[master] Fixed db_lost_callback default to NULL build issue
Replaced = NULL with = 0 in dhcpsrv header files altered for 5477.
-rw-r--r--src/lib/dhcpsrv/cfg_db_access.h2
-rw-r--r--src/lib/dhcpsrv/database_connection.h2
-rw-r--r--src/lib/dhcpsrv/host_data_source_factory.h2
-rw-r--r--src/lib/dhcpsrv/host_mgr.h2
-rw-r--r--src/lib/dhcpsrv/lease_mgr_factory.h2
-rw-r--r--src/lib/dhcpsrv/pgsql_host_data_source.h2
-rw-r--r--src/lib/dhcpsrv/pgsql_lease_mgr.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/dhcpsrv/cfg_db_access.h b/src/lib/dhcpsrv/cfg_db_access.h
index 845535d646..d0c2c9bc38 100644
--- 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 7f89ad2edb..53dbec04d7 100644
--- 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 b941aa730d..1532e16a06 100644
--- 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 7cef82e7b8..e288c26683 100644
--- 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 83fd6017fd..7d6d842bb7 100644
--- 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 2b767a964c..c2aebbd7f7 100644
--- 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 88cf2b1bad..4e2a91424b 100644
--- 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();