From e95d02bd35548d66b44e324aa810f351ed0b1096 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 26 Sep 2017 10:45:11 +0200 Subject: [PATCH] [master] Tentative merge fix --- src/lib/dhcpsrv/client_class_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h index b645214789..1167aa012a 100644 --- a/src/lib/dhcpsrv/client_class_def.h +++ b/src/lib/dhcpsrv/client_class_def.h @@ -245,7 +245,7 @@ public: /// others. void addClass(const std::string& name, const ExpressionPtr& match_expr, const std::string& test, const CfgOptionPtr& options, - CfgOptionDefPtr defs = 0, + CfgOptionDefPtr defs = CfgOptionDefPtr(), asiolink::IOAddress next_server = asiolink::IOAddress("0.0.0.0"), const std::string& sname = std::string(), const std::string& filename = std::string()); -- 2.47.2