mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-09-02 15:05:16 +00:00
[master] Tentative merge fix
This commit is contained in:
@@ -245,7 +245,7 @@ public:
|
|||||||
/// others.
|
/// others.
|
||||||
void addClass(const std::string& name, const ExpressionPtr& match_expr,
|
void addClass(const std::string& name, const ExpressionPtr& match_expr,
|
||||||
const std::string& test, const CfgOptionPtr& options,
|
const std::string& test, const CfgOptionPtr& options,
|
||||||
CfgOptionDefPtr defs = 0,
|
CfgOptionDefPtr defs = CfgOptionDefPtr(),
|
||||||
asiolink::IOAddress next_server = asiolink::IOAddress("0.0.0.0"),
|
asiolink::IOAddress next_server = asiolink::IOAddress("0.0.0.0"),
|
||||||
const std::string& sname = std::string(),
|
const std::string& sname = std::string(),
|
||||||
const std::string& filename = std::string());
|
const std::string& filename = std::string());
|
||||||
|
Reference in New Issue
Block a user