Commit ac10f434 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[3449] Cherry-pick of compilarion fix from Bundy tree

[mavericks] fix trivial build errors

Conflicts:
	src/lib/util/csv_file.cc
	src/lib/util/csv_file.h
parent 3ef9a0f4
......@@ -31,7 +31,6 @@ namespace d2 {
const char* TEST_DNS_SERVER_IP = "127.0.0.1";
size_t TEST_DNS_SERVER_PORT = 5301;
const bool HAS_RDATA = true;
const bool NO_RDATA = false;
//*************************** FauxServer class ***********************
......
......@@ -1706,9 +1706,6 @@ TEST_F(Dhcpv4SrvTest, nextServerGlobal) {
}
// a dummy MAC address
const uint8_t dummyMacAddr[] = {0, 1, 2, 3, 4, 5};
// A dummy MAC address, padded with 0s
const uint8_t dummyChaddr[16] = {0, 1, 2, 3, 4, 5, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0 };
......
......@@ -81,36 +81,6 @@ OptionCustom::checkIndex(const uint32_t index) const {
}
}
template<typename T>
void
OptionCustom::checkDataType(const uint32_t index) const {
// Check that the requested return type is a supported integer.
if (!OptionDataTypeTraits<T>::integer_type) {
isc_throw(isc::dhcp::InvalidDataType, "specified data type"
" is not a supported integer type.");
}
// Get the option definition type.
OptionDataType data_type = definition_.getType();
if (data_type == OPT_RECORD_TYPE) {
const OptionDefinition::RecordFieldsCollection& record_fields =
definition_.getRecordFields();
// When we initialized buffers we have already checked that
// the number of these buffers is equal to number of option
// fields in the record so the condition below should be met.
assert(index < record_fields.size());
// Get the data type to be returned.
data_type = record_fields[index];
}
if (OptionDataTypeTraits<T>::type != data_type) {
isc_throw(isc::dhcp::InvalidDataType,
"specified data type " << data_type << " does not"
" match the data type in an option definition for field"
" index " << index);
}
}
void
OptionCustom::createBuffers() {
definition_.validate();
......
......@@ -353,6 +353,35 @@ private:
/// A pointer to the OptionCustom object.
typedef boost::shared_ptr<OptionCustom> OptionCustomPtr;
template<typename T>
void
OptionCustom::checkDataType(const uint32_t index) const {
// Check that the requested return type is a supported integer.
if (!OptionDataTypeTraits<T>::integer_type) {
isc_throw(isc::dhcp::InvalidDataType, "specified data type"
" is not a supported integer type.");
}
// Get the option definition type.
OptionDataType data_type = definition_.getType();
if (data_type == OPT_RECORD_TYPE) {
const OptionDefinition::RecordFieldsCollection& record_fields =
definition_.getRecordFields();
// When we initialized buffers we have already checked that
// the number of these buffers is equal to number of option
// fields in the record so the condition below should be met.
assert(index < record_fields.size());
// Get the data type to be returned.
data_type = record_fields[index];
}
if (OptionDataTypeTraits<T>::type != data_type) {
isc_throw(isc::dhcp::InvalidDataType,
"specified data type " << data_type << " does not"
" match the data type in an option definition for field"
" index " << index);
}
}
} // namespace isc::dhcp
} // namespace isc
......
......@@ -649,13 +649,6 @@ const char* const root_servers[] = {
"j.root-servers.net", "k.root-servers.net", "l.root-servers.net",
"m.root-servers.net", NULL
};
const char* const gtld_servers[] = {
"a.gtld-servers.net", "b.gtld-servers.net", "c.gtld-servers.net",
"d.gtld-servers.net", "e.gtld-servers.net", "f.gtld-servers.net",
"g.gtld-servers.net", "h.gtld-servers.net", "i.gtld-servers.net",
"j.gtld-servers.net", "k.gtld-servers.net", "l.gtld-servers.net",
"m.gtld-servers.net", NULL
};
const char* const jp_servers[] = {
"a.dns.jp", "b.dns.jp", "c.dns.jp", "d.dns.jp", "e.dns.jp",
"f.dns.jp", "g.dns.jp", NULL
......
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