Commit 67f0b745 authored by Thomas Markwalder's avatar Thomas Markwalder

[#447,!222] Fixed tagged_statement name collision in mysql_cb

src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
src/lib/dhcpsrv/mysql_host_data_source.cc
    Enclosed tagged_statments declarations within
    anonymous namespace to avoid collisions.
parent 23058ff4
......@@ -122,7 +122,7 @@ public:
/// @brief Sends query to insert an audit entry.
///
/// @param in_bindings Collection of bindings representing an option.
void insertAuditEntry4(const MySqlBindingCollection& in_bindings) {
void insertAuditEntry4(const MySqlBindingCollection& /* in_bindings */) {
// Fetch unique identifier of the inserted option.
uint64_t id = mysql_insert_id(conn_.mysql_);
......@@ -2048,6 +2048,8 @@ public:
}
};
namespace {
/// @brief Array of tagged statements.
typedef std::array<TaggedStatement, MySqlConfigBackendDHCPv4Impl::NUM_STATEMENTS>
TaggedStatementArray;
......@@ -2432,6 +2434,8 @@ TaggedStatementArray tagged_statements = { {
}
};
}; // end anonymous namespace
MySqlConfigBackendDHCPv4Impl::
MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters)
: MySqlConfigBackendImpl(parameters) {
......
......@@ -2132,6 +2132,8 @@ public:
bool is_readonly_;
};
namespace {
/// @brief Array of tagged statements.
typedef boost::array<TaggedStatement, MySqlHostDataSourceImpl::NUM_STATEMENTS>
TaggedStatementArray;
......@@ -2430,6 +2432,8 @@ TaggedStatementArray tagged_statements = { {
}
};
}; // anonymous namespace
MySqlHostDataSourceImpl::
MySqlHostDataSourceImpl(const MySqlConnection::ParameterMap& parameters)
: host_exchange_(new MySqlHostWithOptionsExchange(MySqlHostWithOptionsExchange::DHCP4_ONLY)),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment