From a529c56dadfe0fafed86258a8942f54f987dc228 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 26 Nov 2016 08:05:59 +0100 Subject: [PATCH] [5014_phase2] Easier C++11 stuff --- src/lib/dhcpsrv/parsers/simple_parser.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/dhcpsrv/parsers/simple_parser.cc b/src/lib/dhcpsrv/parsers/simple_parser.cc index 9ae9d3d942..5a88fca9cb 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser.cc @@ -11,7 +11,7 @@ namespace isc { namespace dhcp { /// This table defines default values for option definitions in DHCPv4 -const SimpleDefaults OPTION4_DEF_DEFAULTS{ +const SimpleDefaults OPTION4_DEF_DEFAULTS = { { "record-types", Element::string, ""}, { "space", Element::string, "dhcp4"}, { "array", Element::boolean, "false"}, @@ -19,7 +19,7 @@ const SimpleDefaults OPTION4_DEF_DEFAULTS{ }; /// This table defines default values for option definitions in DHCPv6 -const SimpleDefaults OPTION6_DEF_DEFAULTS{ +const SimpleDefaults OPTION6_DEF_DEFAULTS = { { "record-types", Element::string, ""}, { "space", Element::string, "dhcp6"}, { "array", Element::boolean, "false"}, @@ -27,18 +27,18 @@ const SimpleDefaults OPTION6_DEF_DEFAULTS{ }; /// This table defines default values for options in DHCPv4 -const SimpleDefaults OPTION4_DEFAULTS({ +const SimpleDefaults OPTION4_DEFAULTS = { { "space", Element::string, "dhcp4"}, { "csv-format", Element::boolean, "true"}, { "encapsulate", Element::string, "" } -}); +}; /// This table defines default values for options in DHCPv6 -const SimpleDefaults OPTION6_DEFAULTS({ +const SimpleDefaults OPTION6_DEFAULTS = { { "space", Element::string, "dhcp6"}, { "csv-format", Element::boolean, "true"}, { "encapsulate", Element::string, "" } -}); +}; /// This table defines default values for both DHCPv4 and DHCPv6 const SimpleDefaults GLOBAL_DEFAULTS = { -- 2.47.3