2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00

[master] Fixed db_lost_callback default to NULL build issue

Replaced = NULL with = 0 in dhcpsrv header files altered for 5477.
This commit is contained in:
Thomas Markwalder
2018-03-13 09:01:32 -04:00
parent 4eb1198b5e
commit a5cb18b0b4
7 changed files with 7 additions and 7 deletions

View File

@@ -68,7 +68,7 @@ public:
/// @param db_lost_callback function to invoke if connectivity to /// @param db_lost_callback function to invoke if connectivity to
/// either the lease or host managers, once established, is subsequently /// either the lease or host managers, once established, is subsequently
/// lost. /// lost.
void createManagers(DatabaseConnection::DbLostCallback db_lost_callback = NULL) const; void createManagers(DatabaseConnection::DbLostCallback db_lost_callback = 0) const;
/// @brief Unparse an access string /// @brief Unparse an access string
/// ///

View File

@@ -150,7 +150,7 @@ public:
/// @param db_lost_callback Optional call back function to invoke if a /// @param db_lost_callback Optional call back function to invoke if a
/// successfully open connection subsequently fails /// successfully open connection subsequently fails
DatabaseConnection(const ParameterMap& parameters, DatabaseConnection(const ParameterMap& parameters,
DbLostCallback db_lost_callback = NULL) DbLostCallback db_lost_callback = 0)
:parameters_(parameters), db_lost_callback_(db_lost_callback) { :parameters_(parameters), db_lost_callback_(db_lost_callback) {
} }

View File

@@ -67,7 +67,7 @@ public:
/// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not /// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not
/// identify a supported backend. /// identify a supported backend.
static void create(const std::string& dbaccess, static void create(const std::string& dbaccess,
DatabaseConnection::DbLostCallback db_lost_callback = NULL); DatabaseConnection::DbLostCallback db_lost_callback = 0);
/// @brief Destroy host data source /// @brief Destroy host data source
/// ///

View File

@@ -73,7 +73,7 @@ public:
/// @param db_lost_callback function to invoke if connectivity to /// @param db_lost_callback function to invoke if connectivity to
/// the host database is lost. /// the host database is lost.
static void create(const std::string& access = "", 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. /// @brief Returns a sole instance of the @c HostMgr.
/// ///

View File

@@ -71,7 +71,7 @@ public:
/// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not /// @throw isc::dhcp::InvalidType The "type" keyword in dbaccess does not
/// identify a supported backend. /// identify a supported backend.
static void create(const std::string& dbaccess, static void create(const std::string& dbaccess,
DatabaseConnection::DbLostCallback db_lost_callback = NULL); DatabaseConnection::DbLostCallback db_lost_callback = 0);
/// @brief Destroy lease manager /// @brief Destroy lease manager
/// ///

View File

@@ -61,7 +61,7 @@ public:
/// @throw isc::dhcp::DbOperationError An operation on the open database has /// @throw isc::dhcp::DbOperationError An operation on the open database has
/// failed. /// failed.
PgSqlHostDataSource(const DatabaseConnection::ParameterMap& parameters, PgSqlHostDataSource(const DatabaseConnection::ParameterMap& parameters,
DatabaseConnection::DbLostCallback db_lost_callback = NULL); DatabaseConnection::DbLostCallback db_lost_callback = 0);
/// @brief Virtual destructor. /// @brief Virtual destructor.
/// Frees database resources and closes the database connection through /// Frees database resources and closes the database connection through

View File

@@ -59,7 +59,7 @@ public:
/// @throw isc::dhcp::DbOperationError An operation on the open database has /// @throw isc::dhcp::DbOperationError An operation on the open database has
/// failed. /// failed.
PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters, PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters,
DatabaseConnection::DbLostCallback db_lost_callback = NULL); DatabaseConnection::DbLostCallback db_lost_callback = 0);
/// @brief Destructor (closes database) /// @brief Destructor (closes database)
virtual ~PgSqlLeaseMgr(); virtual ~PgSqlLeaseMgr();