From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 19 Dec 2016 10:07:17 +0000 (+0100)
Subject: [5075] Addressed review comments and removed spurious += from Makefile.
X-Git-Tag: trac5088_base~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bfc13fa6d365507c40c5511cff70fb687935426;p=thirdparty%2Fkea.git

[5075] Addressed review comments and removed spurious += from Makefile.
---

diff --git a/src/bin/agent/ctrl_agent_cfg_mgr.h b/src/bin/agent/ctrl_agent_cfg_mgr.h
index f824821034..ebe9ccefcc 100644
--- a/src/bin/agent/ctrl_agent_cfg_mgr.h
+++ b/src/bin/agent/ctrl_agent_cfg_mgr.h
@@ -8,6 +8,7 @@
 #define CTRL_AGENT_CFG_MGR_H
 
 #include <process/d_cfg_mgr.h>
+#include <boost/pointer_cast.hpp>
 
 namespace isc {
 namespace agent {
@@ -81,7 +82,7 @@ protected:
     virtual isc::dhcp::ParserPtr
     createConfigParser(const std::string& element_id,
                        const isc::data::Element::Position& pos
-                       = isc::data::Element::Position());
+                       = isc::data::Element::ZERO_POSITION());
 
     /// @brief Creates a new, blank CtrlAgentCfgContext context.
     ///
diff --git a/src/bin/agent/ctrl_agent_process.cc b/src/bin/agent/ctrl_agent_process.cc
index 5b58588ccd..8674f574a0 100644
--- a/src/bin/agent/ctrl_agent_process.cc
+++ b/src/bin/agent/ctrl_agent_process.cc
@@ -8,6 +8,7 @@
 #include <agent/ctrl_agent_process.h>
 #include <agent/ctrl_agent_log.h>
 #include <cc/command_interpreter.h>
+#include <boost/pointer_cast.hpp>
 
 using namespace isc::process;
 
diff --git a/src/bin/agent/kea-ctrl-agent.xml b/src/bin/agent/kea-ctrl-agent.xml
index f7f6560700..492a6e693f 100644
--- a/src/bin/agent/kea-ctrl-agent.xml
+++ b/src/bin/agent/kea-ctrl-agent.xml
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
                [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -62,7 +62,7 @@
     <para>
       The <command>kea-ctrl-agent</command> provides a REST service for
       controlling Kea services. The received HTTP requests are decapsulated
-      and forwarded to the respective Kea services as JSON strings. Received
+      and forwarded to the respective Kea services in JSON format. Received
       JSON responses are encapsulated within HTTP responses and returned to
       the controlling entity. Some commands may be handled by the Control
       Agent directly, and not forwarded to any Kea service.
diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index 2efa4ab448..a6116339fc 100644
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -56,13 +56,13 @@ ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
-ctrl_agent_unittests_LDADD += += $(top_builddir)/src/lib/stats/libkea-stats.la
+ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
-ctrl_agent_unittests_LDADD += += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 ctrl_agent_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
diff --git a/src/bin/agent/tests/ctrl_agent_controller_unittests.cc b/src/bin/agent/tests/ctrl_agent_controller_unittests.cc
index 6ae9aa06b1..7ad86ca727 100644
--- a/src/bin/agent/tests/ctrl_agent_controller_unittests.cc
+++ b/src/bin/agent/tests/ctrl_agent_controller_unittests.cc
@@ -8,6 +8,7 @@
 #include <agent/ctrl_agent_controller.h>
 #include <agent/ctrl_agent_process.h>
 #include <process/testutils/d_test_stubs.h>
+#include <boost/pointer_cast.hpp>
 
 using namespace isc::agent;
 using namespace isc::process;