You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2020/08/13 18:57:02 UTC
[geode-native] 05/08: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch feature/asio
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit ed30afaf03da5298dec9b44b8c02d0b68d6fd7d2
Author: Blake Bender <bb...@pivotal.io>
AuthorDate: Fri Jul 24 14:44:54 2020 -0700
Fix formatting
---
cppcache/src/PoolAttributes.cpp | 49 ++++++++++++++++----------------
cppcache/src/PoolFactory.cpp | 4 +--
cppcache/src/ThinClientLocatorHelper.cpp | 3 +-
3 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/cppcache/src/PoolAttributes.cpp b/cppcache/src/PoolAttributes.cpp
index 16cd063..af77912 100644
--- a/cppcache/src/PoolAttributes.cpp
+++ b/cppcache/src/PoolAttributes.cpp
@@ -54,31 +54,30 @@ std::shared_ptr<PoolAttributes> PoolAttributes::clone() {
bool PoolAttributes::operator==(const PoolAttributes& other) const {
bool result = false;
- if ((m_isThreadLocalConn == other.m_isThreadLocalConn)
- && (m_freeConnTimeout == other.m_freeConnTimeout)
- && (m_loadCondInterval == other.m_loadCondInterval)
- && (m_sockBufferSize == other.m_sockBufferSize)
- && (m_readTimeout == other.m_readTimeout)
- && (m_minConns == other.m_minConns)
- && (m_maxConns == other.m_maxConns)
- && (m_retryAttempts == other.m_retryAttempts)
- && (m_statsInterval == other.m_statsInterval)
- && (m_redundancy == other.m_redundancy)
- && (m_msgTrackTimeout == other.m_msgTrackTimeout)
- && (m_subsAckInterval == other.m_subsAckInterval)
- && (m_idleTimeout == other.m_idleTimeout)
- && (m_pingInterval == other.m_pingInterval)
- && (m_updateLocatorListInterval == other.m_updateLocatorListInterval)
- && (m_subsEnabled == other.m_subsEnabled)
- && (m_multiuserSecurityMode == other.m_multiuserSecurityMode)
- && (m_isPRSingleHopEnabled == other.m_isPRSingleHopEnabled)
- && (m_serverGrp == other.m_serverGrp)
- && (m_initLocList.size() == other.m_initLocList.size())
- && (m_initServList.size() == other.m_initServList.size())
- && (compareVectorOfStrings(m_initLocList, other.m_initLocList))
- && (compareVectorOfStrings(m_initServList, other.m_initServList))
- && (m_sniProxyHost == other.m_sniProxyHost)
- && (m_sniProxyPort == other.m_sniProxyPort)) {
+ if ((m_isThreadLocalConn == other.m_isThreadLocalConn) &&
+ (m_freeConnTimeout == other.m_freeConnTimeout) &&
+ (m_loadCondInterval == other.m_loadCondInterval) &&
+ (m_sockBufferSize == other.m_sockBufferSize) &&
+ (m_readTimeout == other.m_readTimeout) &&
+ (m_minConns == other.m_minConns) && (m_maxConns == other.m_maxConns) &&
+ (m_retryAttempts == other.m_retryAttempts) &&
+ (m_statsInterval == other.m_statsInterval) &&
+ (m_redundancy == other.m_redundancy) &&
+ (m_msgTrackTimeout == other.m_msgTrackTimeout) &&
+ (m_subsAckInterval == other.m_subsAckInterval) &&
+ (m_idleTimeout == other.m_idleTimeout) &&
+ (m_pingInterval == other.m_pingInterval) &&
+ (m_updateLocatorListInterval == other.m_updateLocatorListInterval) &&
+ (m_subsEnabled == other.m_subsEnabled) &&
+ (m_multiuserSecurityMode == other.m_multiuserSecurityMode) &&
+ (m_isPRSingleHopEnabled == other.m_isPRSingleHopEnabled) &&
+ (m_serverGrp == other.m_serverGrp) &&
+ (m_initLocList.size() == other.m_initLocList.size()) &&
+ (m_initServList.size() == other.m_initServList.size()) &&
+ (compareVectorOfStrings(m_initLocList, other.m_initLocList)) &&
+ (compareVectorOfStrings(m_initServList, other.m_initServList)) &&
+ (m_sniProxyHost == other.m_sniProxyHost) &&
+ (m_sniProxyPort == other.m_sniProxyPort)) {
result = true;
}
diff --git a/cppcache/src/PoolFactory.cpp b/cppcache/src/PoolFactory.cpp
index b8eced9..382b9e9 100644
--- a/cppcache/src/PoolFactory.cpp
+++ b/cppcache/src/PoolFactory.cpp
@@ -172,14 +172,14 @@ PoolFactory& PoolFactory::setServerGroup(std::string group) {
}
PoolFactory& PoolFactory::addLocator(const std::string& host, int port) {
-// addCheck(host, port);
+ // addCheck(host, port);
m_attrs->addLocator(host, port);
m_addedServerOrLocator = true;
return *this;
}
PoolFactory& PoolFactory::addServer(const std::string& host, int port) {
-// addCheck(host, port);
+ // addCheck(host, port);
m_attrs->addServer(host, port);
m_addedServerOrLocator = true;
return *this;
diff --git a/cppcache/src/ThinClientLocatorHelper.cpp b/cppcache/src/ThinClientLocatorHelper.cpp
index 2a45d7e..5f63252 100644
--- a/cppcache/src/ThinClientLocatorHelper.cpp
+++ b/cppcache/src/ThinClientLocatorHelper.cpp
@@ -77,8 +77,7 @@ std::unique_ptr<Connector> ThinClientLocatorHelper::createConnection(
hostname, static_cast<uint16_t>(port), wait, maxBuffSizePool,
systemProperties.sslTrustStore(), systemProperties.sslKeyStore(),
systemProperties.sslKeystorePassword()));
- }
- else {
+ } else {
return std::unique_ptr<Connector>(new TcpSslConn(
hostname, static_cast<uint16_t>(port), m_sniProxyHost, m_sniProxyPort,
wait, maxBuffSizePool, systemProperties.sslTrustStore(),