Skip to content

xercesc 3.2.2 namespace update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
armtir wants to merge 2 commits into
base: master
Choose a base branch
from
Open

xercesc 3.2.2 namespace update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e3923
namespace update
Nov 9, 2020
9dba16b
Update HttpCurl.cpp
armtir Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oadr/oadr/ven/VEN2b.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
#include "../helper/ISO8601Duration.h"

using namespace std;
using namespace xercesc_3_1;
using namespace XERCES_CPP_NAMESPACE;

class VEN2b
{
Expand Down
4 changes: 2 additions & 2 deletions oadr/oadr/ven/http/HttpCurl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion oadrtest/oadrtest/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ TEST_F(FooTest, DoesXyz) {

#include <xercesc/util/PlatformUtils.hpp>

using namespace xercesc_3_1;
using namespace XERCES_CPP_NAMESPACE;

int main(int argc, char **argv)
{
Expand Down
2 changes: 1 addition & 1 deletion oadrtest/oadrtest/tests/ParserTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@

using namespace oadr2b::oadr;

using namespace xercesc_3_1;
using namespace XERCES_CPP_NAMESPACE;

using namespace xsd::cxx::tree;

Expand Down
2 changes: 1 addition & 1 deletion oadrtest/oadrtest/tests/helper/ReportHelperTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ using namespace xml_schema;

using namespace oadr2b::oadr;

using namespace xercesc_3_1;
using namespace XERCES_CPP_NAMESPACE;

/********************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion oadrtest/oadrtest/tests/reportmanager/RegisteredReportsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
#include <oadr/request/Oadr2bRequest.h>
#include <xercesc/util/PlatformUtils.hpp>

using namespace xercesc_3_1;
using namespace XERCES_CPP_NAMESPACE;

TEST(RegisteredReports, LOAD_REGISTERED_REPORTS)
{
Expand Down