From: Francis Dupont <fdupont@isc.org>
Date: Tue, 26 Sep 2017 08:45:11 +0000 (+0200)
Subject: [master] Tentative merge fix
X-Git-Tag: trac5363_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95d02bd35548d66b44e324aa810f351ed0b1096;p=thirdparty%2Fkea.git

[master] Tentative merge fix
---

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());