[pulsar-client-cpp] Fixed some compilation issues when enabling -Wall. (

apache#7502) (apache#7503)
wanghhao · Jul 11, 2020 · bd44a2b · bd44a2b
1 parent a55a405
commit bd44a2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pulsar-client-cpp/include/pulsar/Authentication.h b/pulsar-client-cpp/include/pulsar/Authentication.h
@@ -229,7 +229,7 @@ typedef std::shared_ptr<Oauth2Flow> FlowPtr;
 
 class CachedToken {
    public:
-    ~CachedToken();
+    virtual ~CachedToken();
     virtual bool isExpired() = 0;
     virtual AuthenticationDataPtr getAuthData() = 0;
 

diff --git a/pulsar-client-cpp/lib/ClientImpl.cc b/pulsar-client-cpp/lib/ClientImpl.cc
@@ -97,20 +97,18 @@ ClientImpl::ClientImpl(const std::string& serviceUrl, const ClientConfiguration&
       requestIdGenerator_(0),
       closingError(ResultOk) {
     std::unique_ptr<LoggerFactory> loggerFactory = clientConfiguration_.impl_->takeLogger();
-    if (!logger) {
 #ifdef USE_LOG4CXX
-        if (!clientConfiguration_.getLogConfFilePath().empty()) {
-            // A log4cxx log file was passed through deprecated parameter. Use that to configure Log4CXX
-            loggerFactory = Log4CxxLoggerFactory::create(clientConfiguration_.getLogConfFilePath());
-        } else {
-            // Use default simple console logger
-            loggerFactory = SimpleLoggerFactory::create();
-        }
-#else
+    if (!clientConfiguration_.getLogConfFilePath().empty()) {
+        // A log4cxx log file was passed through deprecated parameter. Use that to configure Log4CXX
+        loggerFactory = Log4CxxLoggerFactory::create(clientConfiguration_.getLogConfFilePath());
+    } else {
         // Use default simple console logger
         loggerFactory = SimpleLoggerFactory::create();
-#endif
     }
+#else
+    // Use default simple console logger
+    loggerFactory = SimpleLoggerFactory::create();
+#endif
     LogUtils::setLoggerFactory(std::move(loggerFactory));
 
     if (serviceUrl_.compare(0, 4, "http") == 0) {