pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] jai1 closed pull request #880: CPP Client - Athens Client header visibile and remove C++11 features
Date Thu, 01 Jan 1970 00:00:00 GMT
jai1 closed pull request #880: CPP Client - Athens Client header visibile and remove C++11
features
URL: https://github.com/apache/incubator-pulsar/pull/880
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-client-cpp/lib/auth/AuthAthenz.cc b/pulsar-client-cpp/lib/auth/AuthAthenz.cc
index 4c5558e76..dd05a6597 100644
--- a/pulsar-client-cpp/lib/auth/AuthAthenz.cc
+++ b/pulsar-client-cpp/lib/auth/AuthAthenz.cc
@@ -77,8 +77,9 @@ namespace pulsar {
             Json::Value root;
             Json::Reader reader;
             if (reader.parse(authParamsString, root, false)) {
-                for (auto key: root.getMemberNames()) {
-                    params[key] = root[key].asString();
+                Json::Value::Members members = root.getMemberNames();
+                for (Json::Value::Members::iterator iter = members.begin(); iter != members.end();
iter++) {
+                    params[*iter] = root[*iter].asString();
                 }
             } else {
                 LOG_ERROR("Invalid String Error: " << reader.getFormatedErrorMessages());
diff --git a/pulsar-client-cpp/lib/auth/athenz/ZTSClient.cc b/pulsar-client-cpp/lib/auth/athenz/ZTSClient.cc
index caa700d4b..da32baab7 100644
--- a/pulsar-client-cpp/lib/auth/athenz/ZTSClient.cc
+++ b/pulsar-client-cpp/lib/auth/athenz/ZTSClient.cc
@@ -143,7 +143,7 @@ namespace pulsar {
         size_t length = strlen(input);
         char *result = (char*)malloc(length);
 
-        bio = BIO_new_mem_buf(input, -1);
+        bio = BIO_new_mem_buf((void *)input, -1);
         b64 = BIO_new(BIO_f_base64());
         bio = BIO_push(b64, bio);
 
diff --git a/pulsar-client-cpp/lib/auth/athenz/ZTSClient.h b/pulsar-client-cpp/lib/auth/athenz/ZTSClient.h
index de1b8ed7a..c27dbb580 100644
--- a/pulsar-client-cpp/lib/auth/athenz/ZTSClient.h
+++ b/pulsar-client-cpp/lib/auth/athenz/ZTSClient.h
@@ -20,6 +20,7 @@
 #include <map>
 #include <lib/LogUtils.h>
 #include <boost/thread.hpp>
+#pragma GCC visibility push(default)
 
 namespace pulsar {
 
@@ -61,3 +62,4 @@ namespace pulsar {
         friend class ZTSClientWrapper;
     };
 }
+#pragma GCC visibility pop


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message