From 92e5b5391d00a96a0b4c1f4947b8ab42d80392f2 Mon Sep 17 00:00:00 2001 From: Andres Andreu Date: Thu, 28 Jun 2012 13:58:39 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Fixed=20scope=20of=20function=20to=20resolv?= =?UTF-8?q?e=20this=20compilation=20error:=20DNP3XML/XmlToConfig.h:123:4:?= =?UTF-8?q?=20error:=20=E2=80=98ConvertMode=E2=80=99=20was=20not=20declare?= =?UTF-8?q?d=20in=20this=20scope,=20and=20no=20declarations=20were=20found?= =?UTF-8?q?=20by=20argument-dependent=20lookup=20at=20the=20point=20of=20i?= =?UTF-8?q?nstantiation=20[-fpermissive]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DNP3XML/XmlToConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNP3XML/XmlToConfig.cpp b/DNP3XML/XmlToConfig.cpp index bf23c2f8..dd0062d7 100644 --- a/DNP3XML/XmlToConfig.cpp +++ b/DNP3XML/XmlToConfig.cpp @@ -213,7 +213,7 @@ DeviceTemplate XmlToConfig::Convert(const APLXML_DNP::DeviceTemplate_t& arCfg, b return t; } -CommandModes ConvertMode(const std::string& arMode) +CommandModes XmlToConfig::ConvertMode(const std::string& arMode) { if(arMode == "SBO") return CM_SBO_ONLY; if(arMode == "DO_ONLY") return CM_DO_ONLY; From 7e8b71535b1b863c374e2bf748004945bf969987 Mon Sep 17 00:00:00 2001 From: Andres Andreu Date: Thu, 28 Jun 2012 13:59:59 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Added=20function=20declaration=20as=20part?= =?UTF-8?q?=20of=20a=20resolution=20to=20this=20compilation=20error:=20DNP?= =?UTF-8?q?3XML/XmlToConfig.h:123:4:=20error:=20=E2=80=98ConvertMode?= =?UTF-8?q?=E2=80=99=20was=20not=20declared=20in=20this=20scope,=20and=20n?= =?UTF-8?q?o=20declarations=20were=20found=20by=20argument-dependent=20loo?= =?UTF-8?q?kup=20at=20the=20point=20of=20instantiation=20[-fpermissive]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DNP3XML/XmlToConfig.h | 1 + 1 file changed, 1 insertion(+) diff --git a/DNP3XML/XmlToConfig.h b/DNP3XML/XmlToConfig.h index 0131b1c3..76e2513c 100644 --- a/DNP3XML/XmlToConfig.h +++ b/DNP3XML/XmlToConfig.h @@ -84,6 +84,7 @@ class XmlToConfig static SlaveConfig Convert(const APLXML_DNP::SlaveConfig_t& arCfg, const APLXML_DNP::AppLayer_t& arApp); static VtoConfig Convert(const APLXML_DNP::VtoPorts_t& arCfg); static DeviceTemplate Convert( const APLXML_DNP::DeviceTemplate_t& arCfg, bool aStartOnline = false); + static CommandModes ConvertMode(const std::string& arMode); private: