From a8e39238dcecfc6309be91c3a0a715b33eefde84 Mon Sep 17 00:00:00 2001 From: Armin Tirala Date: Mon, 9 Nov 2020 11:51:44 +0100 Subject: [PATCH 1/2] namespace update --- oadr/oadr/ven/VEN2b.h | 2 +- oadrtest/oadrtest/main.cpp | 2 +- oadrtest/oadrtest/tests/ParserTest.cpp | 2 +- oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp | 2 +- oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oadr/oadr/ven/VEN2b.h b/oadr/oadr/ven/VEN2b.h index 53d674a..8e9c5b7 100644 --- a/oadr/oadr/ven/VEN2b.h +++ b/oadr/oadr/ven/VEN2b.h @@ -352,7 +352,7 @@ #include "../helper/ISO8601Duration.h" using namespace std; -using namespace xercesc_3_1; +using namespace XERCES_CPP_NAMESPACE; class VEN2b { diff --git a/oadrtest/oadrtest/main.cpp b/oadrtest/oadrtest/main.cpp index 215ff97..da68b96 100644 --- a/oadrtest/oadrtest/main.cpp +++ b/oadrtest/oadrtest/main.cpp @@ -373,7 +373,7 @@ TEST_F(FooTest, DoesXyz) { #include -using namespace xercesc_3_1; +using namespace XERCES_CPP_NAMESPACE; int main(int argc, char **argv) { diff --git a/oadrtest/oadrtest/tests/ParserTest.cpp b/oadrtest/oadrtest/tests/ParserTest.cpp index 64dc054..ebf165a 100644 --- a/oadrtest/oadrtest/tests/ParserTest.cpp +++ b/oadrtest/oadrtest/tests/ParserTest.cpp @@ -332,7 +332,7 @@ using namespace oadr2b::oadr; -using namespace xercesc_3_1; +using namespace XERCES_CPP_NAMESPACE; using namespace xsd::cxx::tree; diff --git a/oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp b/oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp index 6d64103..1937470 100644 --- a/oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp +++ b/oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp @@ -59,7 +59,7 @@ using namespace xml_schema; using namespace oadr2b::oadr; -using namespace xercesc_3_1; +using namespace XERCES_CPP_NAMESPACE; /********************************************************************************/ diff --git a/oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp b/oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp index d7eeb77..2143520 100644 --- a/oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp +++ b/oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp @@ -322,7 +322,7 @@ #include #include -using namespace xercesc_3_1; +using namespace XERCES_CPP_NAMESPACE; TEST(RegisteredReports, LOAD_REGISTERED_REPORTS) { From 9dba16b31a1224dd2eb607f525ed36e6ca75de25 Mon Sep 17 00:00:00 2001 From: armtir Date: Mon, 23 Nov 2020 14:29:35 +0100 Subject: [PATCH 2/2] Update HttpCurl.cpp --- oadr/oadr/ven/http/HttpCurl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oadr/oadr/ven/http/HttpCurl.cpp b/oadr/oadr/ven/http/HttpCurl.cpp index 32b2c63..497d5b6 100644 --- a/oadr/oadr/ven/http/HttpCurl.cpp +++ b/oadr/oadr/ven/http/HttpCurl.cpp @@ -673,13 +673,13 @@ void HttpCurl::setTimeouts(long connectTimeout, long requestTimeout) { CURLcode result; - if ((result = curl_easy_setopt(m_curl, CURLOPT_CONNECTTIMEOUT, &connectTimeout)) != 0) + if ((result = curl_easy_setopt(m_curl, CURLOPT_CONNECTTIMEOUT, connectTimeout)) != 0) { CurlException ex(result, m_message); throw ex; } - if ((result = curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, &requestTimeout)) != 0) + if ((result = curl_easy_setopt(m_curl, CURLOPT_TIMEOUT, requestTimeout)) != 0) { CurlException ex(result, m_message); throw ex;