This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 7ed0bc5 GEODE-8184: Enforce no-extra-semi as error (#605)
7ed0bc5 is described below
commit 7ed0bc5f369e3e30f437fc71652ae02c4d6bc18c
Author: M. Oleske <[email protected]>
AuthorDate: Thu May 28 07:17:37 2020 -0700
GEODE-8184: Enforce no-extra-semi as error (#605)
---
CMakeLists.txt | 1 -
cppcache/include/geode/CacheStatistics.hpp | 2 +-
cppcache/include/geode/PdxSerializable.hpp | 2 +-
cppcache/integration-test/QueryHelper.hpp | 8 +--
cppcache/integration-test/QueryStrings.hpp | 18 +++---
cppcache/integration-test/ThinClientDurable.hpp | 4 +-
.../integration-test/ThinClientDurableFailover.hpp | 4 +-
.../integration-test/ThinClientDurableInterest.hpp | 4 +-
.../testThinClientAfterRegionLive.cpp | 2 +-
.../testThinClientHAPeriodicAck.cpp | 4 +-
cppcache/src/CacheImpl.hpp | 4 +-
cppcache/src/EventIdMap.hpp | 2 +-
cppcache/src/MapEntry.hpp | 2 +-
cppcache/src/PdxTypeRegistry.hpp | 2 +-
cppcache/src/RegionCommit.hpp | 4 +-
cppcache/src/RegionInternal.hpp | 2 +-
cppcache/src/SerializableHelper.hpp | 2 +-
cppcache/src/TSSTXStateWrapper.hpp | 2 +-
cppcache/src/TXState.hpp | 8 +--
cppcache/src/Task.hpp | 2 +-
cppcache/src/TcpSslConn.hpp | 4 +-
cppcache/src/TcrConnectionManager.hpp | 6 +-
cppcache/src/TcrHADistributionManager.hpp | 4 +-
cppcache/src/ThinClientBaseDM.hpp | 10 ++--
.../src/ThinClientCacheDistributionManager.hpp | 2 +-
cppcache/src/ThinClientDistributionManager.hpp | 4 +-
cppcache/src/ThinClientPoolDM.hpp | 4 +-
cppcache/src/TombstoneList.hpp | 4 +-
cppcache/src/Version.hpp | 2 +-
cryptoimpl/Ssl.hpp | 2 +-
tests/cpp/fwklib/FwkBB.hpp | 14 ++---
tests/cpp/fwklib/FwkBBClient.hpp | 4 +-
tests/cpp/fwklib/FwkBBServer.hpp | 6 +-
tests/cpp/fwklib/FwkStrCvt.hpp | 64 +++++++++++-----------
tests/cpp/security/CredentialGenerator.hpp | 8 +--
tests/cpp/security/DummyCredentialGenerator.hpp | 2 +-
tests/cpp/security/PkcsCredentialGenerator.hpp | 2 +-
tests/cpp/testobject/PdxType.hpp | 2 +-
38 files changed, 110 insertions(+), 113 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d2c301..26a012d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-Weverything
-Wno-non-virtual-dtor #TODO fix
-Wno-missing-prototypes #TODO fix
- -Wno-extra-semi # TODO fix
-Wno-sign-conversion #TODO fix
-Wno-deprecated #TODO fix
-Wno-old-style-cast #TODO fix
diff --git a/cppcache/include/geode/CacheStatistics.hpp
b/cppcache/include/geode/CacheStatistics.hpp
index 1937ea4..5bf3337 100644
--- a/cppcache/include/geode/CacheStatistics.hpp
+++ b/cppcache/include/geode/CacheStatistics.hpp
@@ -49,7 +49,7 @@ class APACHE_GEODE_EXPORT CacheStatistics {
public:
typedef std::chrono::system_clock::time_point time_point;
- CacheStatistics() : m_lastAccessTime(0), m_lastModifiedTime(0){};
+ CacheStatistics() : m_lastAccessTime(0), m_lastModifiedTime(0) {}
CacheStatistics(const CacheStatistics&) = delete;
virtual ~CacheStatistics() = default;
diff --git a/cppcache/include/geode/PdxSerializable.hpp
b/cppcache/include/geode/PdxSerializable.hpp
index 3cf1842..84d9c17 100644
--- a/cppcache/include/geode/PdxSerializable.hpp
+++ b/cppcache/include/geode/PdxSerializable.hpp
@@ -40,7 +40,7 @@ class PdxWriter;
class APACHE_GEODE_EXPORT PdxSerializable : public virtual Serializable,
public virtual CacheableKey {
public:
- ~PdxSerializable() noexcept override{};
+ ~PdxSerializable() noexcept override {}
std::string toString() const override;
diff --git a/cppcache/integration-test/QueryHelper.hpp
b/cppcache/integration-test/QueryHelper.hpp
index 18e3249..efe3fd9 100644
--- a/cppcache/integration-test/QueryHelper.hpp
+++ b/cppcache/integration-test/QueryHelper.hpp
@@ -110,10 +110,10 @@ class QueryHelper {
size_t rowCount, int32_t fieldCount);
// utility methods
- virtual size_t getPortfolioSetSize() { return portfolioSetSize; };
- virtual size_t getPortfolioNumSets() { return portfolioNumSets; };
- virtual size_t getPositionSetSize() { return positionSetSize; };
- virtual size_t getPositionNumSets() { return positionNumSets; };
+ virtual size_t getPortfolioSetSize() { return portfolioSetSize; }
+ virtual size_t getPortfolioNumSets() { return portfolioNumSets; }
+ virtual size_t getPositionSetSize() { return positionSetSize; }
+ virtual size_t getPositionNumSets() { return positionNumSets; }
bool isExpectedRowsConstantRS(int queryindex) {
for (int i = (sizeof(constantExpectedRowsRS) / sizeof(int)) - 1; i > -1;
diff --git a/cppcache/integration-test/QueryStrings.hpp
b/cppcache/integration-test/QueryStrings.hpp
index d251d19..133cfc7 100644
--- a/cppcache/integration-test/QueryStrings.hpp
+++ b/cppcache/integration-test/QueryStrings.hpp
@@ -65,15 +65,15 @@ class QueryStrings {
haveLargeResultset(pisLargeResultset) {}
- static int RSsize() { return RS_ARRAY_SIZE; };
- static int RSPsize() { return RSP_ARRAY_SIZE; };
- static int RSOPLsize() { return RSOPL_ARRAY_SIZE; };
- static int SSsize() { return SS_ARRAY_SIZE; };
- static int SSPsize() { return SSP_ARRAY_SIZE; };
- static int SSOPLsize() { return SSOPL_ARRAY_SIZE; };
- static int RQsize() { return RQ_ARRAY_SIZE; };
- static int CQRSsize() { return CQRS_ARRAY_SIZE; };
- const std::string& query() const { return _query; };
+ static int RSsize() { return RS_ARRAY_SIZE; }
+ static int RSPsize() { return RSP_ARRAY_SIZE; }
+ static int RSOPLsize() { return RSOPL_ARRAY_SIZE; }
+ static int SSsize() { return SS_ARRAY_SIZE; }
+ static int SSPsize() { return SSP_ARRAY_SIZE; }
+ static int SSOPLsize() { return SSOPL_ARRAY_SIZE; }
+ static int RQsize() { return RQ_ARRAY_SIZE; }
+ static int CQRSsize() { return CQRS_ARRAY_SIZE; }
+ const std::string& query() const { return _query; }
public:
std::string _query;
diff --git a/cppcache/integration-test/ThinClientDurable.hpp
b/cppcache/integration-test/ThinClientDurable.hpp
index 2a35737..1929d83 100644
--- a/cppcache/integration-test/ThinClientDurable.hpp
+++ b/cppcache/integration-test/ThinClientDurable.hpp
@@ -137,9 +137,9 @@ class OperMonitor : public CacheListener {
check(event);
}
- void afterRegionInvalidate(const RegionEvent&) override{};
+ void afterRegionInvalidate(const RegionEvent&) override{}
- void afterRegionDestroy(const RegionEvent&) override{};
+ void afterRegionDestroy(const RegionEvent&) override{}
};
void setCacheListener(const char* regName,
diff --git a/cppcache/integration-test/ThinClientDurableFailover.hpp
b/cppcache/integration-test/ThinClientDurableFailover.hpp
index 9d169e1..4f3000a 100644
--- a/cppcache/integration-test/ThinClientDurableFailover.hpp
+++ b/cppcache/integration-test/ThinClientDurableFailover.hpp
@@ -131,9 +131,9 @@ class OperMonitor : public CacheListener {
check(event);
}
- void afterRegionInvalidate(const RegionEvent&) override{};
+ void afterRegionInvalidate(const RegionEvent&) override{}
- void afterRegionDestroy(const RegionEvent&) override{};
+ void afterRegionDestroy(const RegionEvent&) override{}
};
void setCacheListener(const char* regName,
diff --git a/cppcache/integration-test/ThinClientDurableInterest.hpp
b/cppcache/integration-test/ThinClientDurableInterest.hpp
index b3f9b58..8cb610b 100644
--- a/cppcache/integration-test/ThinClientDurableInterest.hpp
+++ b/cppcache/integration-test/ThinClientDurableInterest.hpp
@@ -116,9 +116,9 @@ class OperMonitor : public CacheListener {
void afterUpdate(const EntryEvent& event) override { check(event); }
- void afterRegionInvalidate(const RegionEvent&) override{};
+ void afterRegionInvalidate(const RegionEvent&) override{}
- void afterRegionDestroy(const RegionEvent&) override{};
+ void afterRegionDestroy(const RegionEvent&) override{}
void afterRegionLive(const RegionEvent&) override {
LOG("afterRegionLive called.");
diff --git a/cppcache/integration-test/testThinClientAfterRegionLive.cpp
b/cppcache/integration-test/testThinClientAfterRegionLive.cpp
index b5e8f20..7944d11 100644
--- a/cppcache/integration-test/testThinClientAfterRegionLive.cpp
+++ b/cppcache/integration-test/testThinClientAfterRegionLive.cpp
@@ -39,7 +39,7 @@ class DisconnectCacheListioner : public CacheListener {
int m_index;
public:
- explicit DisconnectCacheListioner(int index) { m_index = index; };
+ explicit DisconnectCacheListioner(int index) { m_index = index; }
void afterRegionDisconnected(Region &) override {
isRegionDead[m_index] = true;
diff --git a/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
b/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
index 6191a78..25d77fd 100644
--- a/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
+++ b/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
@@ -81,9 +81,9 @@ class DupChecker : public CacheListener {
void afterUpdate(const EntryEvent &event) override { check(event); }
- void afterRegionInvalidate(const RegionEvent &) override{};
+ void afterRegionInvalidate(const RegionEvent &) override {}
- void afterRegionDestroy(const RegionEvent &) override{};
+ void afterRegionDestroy(const RegionEvent &) override {}
};
///////////////////////////////////////////////////////
diff --git a/cppcache/src/CacheImpl.hpp b/cppcache/src/CacheImpl.hpp
index 3d0de50..98978e5 100644
--- a/cppcache/src/CacheImpl.hpp
+++ b/cppcache/src/CacheImpl.hpp
@@ -93,9 +93,7 @@ class APACHE_GEODE_EXPORT CacheImpl {
void setClientCrashTEST();
// For PrSingleHop C++unit testing.
- void setNetworkHopFlag(bool networkhopflag) {
- m_networkhop = networkhopflag;
- };
+ void setNetworkHopFlag(bool networkhopflag) { m_networkhop = networkhopflag;
}
bool getAndResetNetworkHopFlag() { return m_networkhop.exchange(false); }
diff --git a/cppcache/src/EventIdMap.hpp b/cppcache/src/EventIdMap.hpp
index 6ec3379..ed9b848 100644
--- a/cppcache/src/EventIdMap.hpp
+++ b/cppcache/src/EventIdMap.hpp
@@ -67,7 +67,7 @@ class APACHE_GEODE_EXPORT EventIdMap {
EventIdMap &operator=(const EventIdMap &);
public:
- EventIdMap() : m_expiry(0){};
+ EventIdMap() : m_expiry(0) {}
void clear();
diff --git a/cppcache/src/MapEntry.hpp b/cppcache/src/MapEntry.hpp
index 3ac27ba..14bec14 100644
--- a/cppcache/src/MapEntry.hpp
+++ b/cppcache/src/MapEntry.hpp
@@ -258,7 +258,7 @@ class MapEntryImpl : public MapEntry,
"non-versioned MapEntry");
}
- void cleanup(const CacheEventFlags) override{};
+ void cleanup(const CacheEventFlags) override {}
protected:
inline explicit MapEntryImpl(bool) : MapEntry(true) {}
diff --git a/cppcache/src/PdxTypeRegistry.hpp b/cppcache/src/PdxTypeRegistry.hpp
index 74dc5cb..8b266e5 100644
--- a/cppcache/src/PdxTypeRegistry.hpp
+++ b/cppcache/src/PdxTypeRegistry.hpp
@@ -129,7 +129,7 @@ class APACHE_GEODE_EXPORT PdxTypeRegistry
inline const PreservedHashMap& getPreserveDataMap() const {
return preserveData;
- };
+ }
int32_t getEnumValue(std::shared_ptr<EnumInfo> ei);
diff --git a/cppcache/src/RegionCommit.hpp b/cppcache/src/RegionCommit.hpp
index 64637f7..10eb087 100644
--- a/cppcache/src/RegionCommit.hpp
+++ b/cppcache/src/RegionCommit.hpp
@@ -41,8 +41,8 @@ namespace client {
class RegionCommit {
public:
explicit RegionCommit(MemberListForVersionStamp& memberListForVersionStamp)
- : m_memberListForVersionStamp(memberListForVersionStamp){};
- virtual ~RegionCommit(){};
+ : m_memberListForVersionStamp(memberListForVersionStamp) {}
+ virtual ~RegionCommit() {}
void fromData(DataInput& input);
void apply(Cache* cache);
diff --git a/cppcache/src/RegionInternal.hpp b/cppcache/src/RegionInternal.hpp
index ce29887..fd340ba 100644
--- a/cppcache/src/RegionInternal.hpp
+++ b/cppcache/src/RegionInternal.hpp
@@ -271,7 +271,7 @@ class RegionInternal : public Region {
std::shared_ptr<RegionEntry> createRegionEntry(
const std::shared_ptr<CacheableKey>& key,
const std::shared_ptr<Cacheable>& value);
- virtual void addDisMessToQueue(){};
+ virtual void addDisMessToQueue() {}
virtual void txDestroy(const std::shared_ptr<CacheableKey>& key,
const std::shared_ptr<Serializable>& callBack,
diff --git a/cppcache/src/SerializableHelper.hpp
b/cppcache/src/SerializableHelper.hpp
index 729a332..39b5565 100644
--- a/cppcache/src/SerializableHelper.hpp
+++ b/cppcache/src/SerializableHelper.hpp
@@ -32,7 +32,7 @@ struct SerializableHelper {
inline void serialize(DataOutput& dataOutput,
const _Serializable& serializable) {
serializable.toData(dataOutput);
- };
+ }
inline void deserialize(DataInput& dataInput, _Serializable& serializable) {
serializable.fromData(dataInput);
diff --git a/cppcache/src/TSSTXStateWrapper.hpp
b/cppcache/src/TSSTXStateWrapper.hpp
index 3567b78..f4d7781 100644
--- a/cppcache/src/TSSTXStateWrapper.hpp
+++ b/cppcache/src/TSSTXStateWrapper.hpp
@@ -30,7 +30,7 @@ class TXState;
class TSSTXStateWrapper {
public:
- inline TSSTXStateWrapper() : m_txState(nullptr){};
+ inline TSSTXStateWrapper() : m_txState(nullptr) {}
~TSSTXStateWrapper() noexcept;
diff --git a/cppcache/src/TXState.hpp b/cppcache/src/TXState.hpp
index dee1b3d..1e51ae7 100644
--- a/cppcache/src/TXState.hpp
+++ b/cppcache/src/TXState.hpp
@@ -62,8 +62,8 @@ class TXState {
}
private:
- void startReplay() { m_replay = true; };
- void endReplay() { m_replay = false; };
+ void startReplay() { m_replay = true; }
+ void endReplay() { m_replay = false; }
private:
TXId m_txId;
@@ -89,8 +89,8 @@ class TXState {
public:
explicit ReplayControl(TXState* txState) : m_txState(txState) {
m_txState->startReplay();
- };
- virtual ~ReplayControl() { m_txState->endReplay(); };
+ }
+ virtual ~ReplayControl() { m_txState->endReplay(); }
private:
TXState* m_txState;
diff --git a/cppcache/src/Task.hpp b/cppcache/src/Task.hpp
index 5612422..a86783d 100644
--- a/cppcache/src/Task.hpp
+++ b/cppcache/src/Task.hpp
@@ -47,7 +47,7 @@ class Task {
runnable_(false),
appDomainContext_(createAppDomainContext()) {}
- inline ~Task() noexcept { stop(); };
+ inline ~Task() noexcept { stop(); }
inline void start() {
runnable_ = true;
diff --git a/cppcache/src/TcpSslConn.hpp b/cppcache/src/TcpSslConn.hpp
index 378c8c6..953f78f 100644
--- a/cppcache/src/TcpSslConn.hpp
+++ b/cppcache/src/TcpSslConn.hpp
@@ -60,7 +60,7 @@ class TcpSslConn : public TcpConn {
m_ssl(nullptr),
m_pubkeyfile(pubkeyfile),
m_privkeyfile(privkeyfile),
- m_pemPassword(pemPassword){};
+ m_pemPassword(pemPassword) {}
TcpSslConn(const char* ipaddr, std::chrono::microseconds waitSeconds,
int32_t maxBuffSizePool, const char* pubkeyfile,
@@ -69,7 +69,7 @@ class TcpSslConn : public TcpConn {
m_ssl(nullptr),
m_pubkeyfile(pubkeyfile),
m_privkeyfile(privkeyfile),
- m_pemPassword(pemPassword){};
+ m_pemPassword(pemPassword) {}
// TODO: Watch out for virt dtor calling virt methods!
diff --git a/cppcache/src/TcrConnectionManager.hpp
b/cppcache/src/TcrConnectionManager.hpp
index e152361..ed8763b 100644
--- a/cppcache/src/TcrConnectionManager.hpp
+++ b/cppcache/src/TcrConnectionManager.hpp
@@ -100,9 +100,9 @@ class TcrConnectionManager {
m_poolEndpointList.push_back(endpoint);
}
- bool isDurable() { return m_isDurable; };
- bool haEnabled() { return m_redundancyManager->m_HAenabled; };
- CacheImpl* getCacheImpl() const { return m_cache; };
+ bool isDurable() { return m_isDurable; }
+ bool haEnabled() { return m_redundancyManager->m_HAenabled; }
+ CacheImpl* getCacheImpl() const { return m_cache; }
GfErrType sendSyncRequestCq(TcrMessage& request, TcrMessageReply& reply,
TcrHADistributionManager* theHADM);
diff --git a/cppcache/src/TcrHADistributionManager.hpp
b/cppcache/src/TcrHADistributionManager.hpp
index ce90c3d..4c24d78 100644
--- a/cppcache/src/TcrHADistributionManager.hpp
+++ b/cppcache/src/TcrHADistributionManager.hpp
@@ -63,11 +63,11 @@ class APACHE_GEODE_EXPORT TcrHADistributionManager
void acquireRedundancyLock() override {
m_connManager.acquireRedundancyLock();
- };
+ }
void releaseRedundancyLock() override {
m_connManager.releaseRedundancyLock();
- };
+ }
protected:
GfErrType sendSyncRequestRegisterInterest(
diff --git a/cppcache/src/ThinClientBaseDM.hpp
b/cppcache/src/ThinClientBaseDM.hpp
index 779f441..e9d00a7 100644
--- a/cppcache/src/ThinClientBaseDM.hpp
+++ b/cppcache/src/ThinClientBaseDM.hpp
@@ -67,11 +67,11 @@ class ThinClientBaseDM {
virtual void failover();
- virtual void acquireFailoverLock(){};
- virtual void releaseFailoverLock(){};
- virtual void acquireRedundancyLock(){};
- virtual void releaseRedundancyLock(){};
- virtual void triggerRedundancyThread(){};
+ virtual void acquireFailoverLock() {}
+ virtual void releaseFailoverLock() {}
+ virtual void acquireRedundancyLock() {}
+ virtual void releaseRedundancyLock() {}
+ virtual void triggerRedundancyThread() {}
virtual bool isSecurityOn();
virtual bool isMultiUserMode() { return false; }
diff --git a/cppcache/src/ThinClientCacheDistributionManager.hpp
b/cppcache/src/ThinClientCacheDistributionManager.hpp
index a27b651..24d8d81 100644
--- a/cppcache/src/ThinClientCacheDistributionManager.hpp
+++ b/cppcache/src/ThinClientCacheDistributionManager.hpp
@@ -40,7 +40,7 @@ class APACHE_GEODE_EXPORT ThinClientCacheDistributionManager
public:
explicit ThinClientCacheDistributionManager(
TcrConnectionManager& connManager);
- ~ThinClientCacheDistributionManager(){};
+ ~ThinClientCacheDistributionManager() {}
void init();
virtual GfErrType sendSyncRequest(TcrMessage& request, TcrMessageReply&
reply,
diff --git a/cppcache/src/ThinClientDistributionManager.hpp
b/cppcache/src/ThinClientDistributionManager.hpp
index 794cbf2..b1657e1 100644
--- a/cppcache/src/ThinClientDistributionManager.hpp
+++ b/cppcache/src/ThinClientDistributionManager.hpp
@@ -43,8 +43,8 @@ class ThinClientDistributionManager : public ThinClientBaseDM
{
void failover() override;
- void acquireFailoverLock() override { m_endpointsLock.lock(); };
- void releaseFailoverLock() override { m_endpointsLock.unlock(); };
+ void acquireFailoverLock() override { m_endpointsLock.lock(); }
+ void releaseFailoverLock() override { m_endpointsLock.unlock(); }
TcrEndpoint* getActiveEndpoint() override {
return m_endpoints[m_activeEndpoint];
diff --git a/cppcache/src/ThinClientPoolDM.hpp
b/cppcache/src/ThinClientPoolDM.hpp
index b7bdffb..711e906 100644
--- a/cppcache/src/ThinClientPoolDM.hpp
+++ b/cppcache/src/ThinClientPoolDM.hpp
@@ -114,7 +114,7 @@ class ThinClientPoolDM
// void updateQueue(const char* regionPath) ;
ClientProxyMembershipID* getMembershipId() { return m_memId.get(); }
- virtual void processMarker(){};
+ virtual void processMarker() {}
bool checkDupAndAdd(std::shared_ptr<EventId> eventid) override;
std::recursive_mutex& getPoolLock() { return mutex_; }
void reducePoolSize(int num);
@@ -133,7 +133,7 @@ class ThinClientPoolDM
virtual void setStickyNull(bool isBGThread) {
if (!isBGThread) m_manager->setStickyConnection(nullptr, false);
- };
+ }
virtual bool canItBeDeletedNoImpl(TcrConnection* conn);
diff --git a/cppcache/src/TombstoneList.hpp b/cppcache/src/TombstoneList.hpp
index 99b8fe2..2e81eeb 100644
--- a/cppcache/src/TombstoneList.hpp
+++ b/cppcache/src/TombstoneList.hpp
@@ -54,8 +54,8 @@ class TombstoneEntry {
void setExpiryTaskId(ExpiryTaskManager::id_type expiryTaskId) {
m_expiryTaskId = expiryTaskId;
}
- TombstoneExpiryHandler* getHandler() { return m_handler; };
- void setHandler(TombstoneExpiryHandler* handler) { m_handler = handler; };
+ TombstoneExpiryHandler* getHandler() { return m_handler; }
+ void setHandler(TombstoneExpiryHandler* handler) { m_handler = handler; }
private:
std::shared_ptr<MapEntryImpl> m_entry;
diff --git a/cppcache/src/Version.hpp b/cppcache/src/Version.hpp
index 2b3fcab..8fedbde 100644
--- a/cppcache/src/Version.hpp
+++ b/cppcache/src/Version.hpp
@@ -34,7 +34,7 @@ class Version {
private:
static int8_t m_ordinal;
- Version(){};
+ Version() {}
};
} // namespace client
} // namespace geode
diff --git a/cryptoimpl/Ssl.hpp b/cryptoimpl/Ssl.hpp
index 8e5e1ff..45b8da5 100644
--- a/cryptoimpl/Ssl.hpp
+++ b/cryptoimpl/Ssl.hpp
@@ -30,7 +30,7 @@ namespace geode {
namespace client {
class Ssl {
public:
- virtual ~Ssl(){};
+ virtual ~Ssl() {}
virtual int setOption(int, int, void*, int) = 0;
virtual int listen(ACE_INET_Addr, std::chrono::microseconds) = 0;
virtual int connect(ACE_INET_Addr, std::chrono::microseconds) = 0;
diff --git a/tests/cpp/fwklib/FwkBB.hpp b/tests/cpp/fwklib/FwkBB.hpp
index 8d7c1dc..9fad965 100644
--- a/tests/cpp/fwklib/FwkBB.hpp
+++ b/tests/cpp/fwklib/FwkBB.hpp
@@ -170,40 +170,40 @@ class FwkBBMessage {
/** @brief set Id of message
* @param sId id of message
*/
- void setId(std::string id) { m_id = id; };
+ void setId(std::string id) { m_id = id; }
/** @brief set command of message
* @param sCommand command of message
*/
- void setCommand(std::string cmd) { m_cmd = cmd; };
+ void setCommand(std::string cmd) { m_cmd = cmd; }
/** @brief set result of message
* @param sResult result of message
*/
- void setResult(std::string result) { m_result = result; };
+ void setResult(std::string result) { m_result = result; }
/** @brief add parameter value to message
* @param sParameter parameter of message
*/
void addParameter(std::string parameter) {
m_parameterVector.push_back(parameter);
- };
+ }
/** @brief get id of message
* @retval id of message
*/
- std::string getId() { return m_id; };
+ std::string getId() { return m_id; }
/** @brief get command of message
* @retval command of message
*/
- std::string getCommand() { return m_cmd; };
+ std::string getCommand() { return m_cmd; }
char getCmdChar() { return m_cmd.at(0); }
/** @brief get result of message
* @retval result of message
*/
- std::string getResult() { return m_result; };
+ std::string getResult() { return m_result; }
/** @brief get parameter of message
* @retval parameter of message
diff --git a/tests/cpp/fwklib/FwkBBClient.hpp b/tests/cpp/fwklib/FwkBBClient.hpp
index 8306cd9..e724cdd 100644
--- a/tests/cpp/fwklib/FwkBBClient.hpp
+++ b/tests/cpp/fwklib/FwkBBClient.hpp
@@ -165,11 +165,11 @@ class FwkBBClient {
private:
/** @brief get new message id
*/
- uint32_t getNewMessageId() { return ++m_messageId; };
+ uint32_t getNewMessageId() { return ++m_messageId; }
/** @brief get current message id
*/
- uint32_t getCurrentMessageId() { return m_messageId; };
+ uint32_t getCurrentMessageId() { return m_messageId; }
/** @brief send a message to server
* @param message message to send
diff --git a/tests/cpp/fwklib/FwkBBServer.hpp b/tests/cpp/fwklib/FwkBBServer.hpp
index 6d9141a..0404f43 100644
--- a/tests/cpp/fwklib/FwkBBServer.hpp
+++ b/tests/cpp/fwklib/FwkBBServer.hpp
@@ -50,13 +50,13 @@ namespace testframework {
class NameKeyPair {
public:
NameKeyPair(std::string sName, std::string sKey)
- : m_name(sName), m_key(sKey){};
+ : m_name(sName), m_key(sKey) {}
/** @brief get name */
- const std::string& getName() const { return m_name; };
+ const std::string& getName() const { return m_name; }
/** @brief get value */
- const std::string& getKey() const { return m_key; };
+ const std::string& getKey() const { return m_key; }
private:
std::string m_name;
diff --git a/tests/cpp/fwklib/FwkStrCvt.hpp b/tests/cpp/fwklib/FwkStrCvt.hpp
index bfbe1c8..6fbc356 100644
--- a/tests/cpp/fwklib/FwkStrCvt.hpp
+++ b/tests/cpp/fwklib/FwkStrCvt.hpp
@@ -74,11 +74,11 @@ class FwkStrCvt {
static char* hexify(uint8_t* buff, int32_t len);
/** @brief convert from string value */
- explicit FwkStrCvt(const std::string& text) { m_sText = text; };
+ explicit FwkStrCvt(const std::string& text) { m_sText = text; }
/** @brief convert from string value */
explicit FwkStrCvt(const char* pszText) {
if (pszText) m_sText = pszText;
- };
+ }
/** @brief convert from double value */
explicit FwkStrCvt(const double dValue) {
char szText[50];
@@ -87,7 +87,7 @@ class FwkStrCvt {
} else {
m_sText.clear();
}
- };
+ }
/** @brief convert from float value */
explicit FwkStrCvt(const float fValue) {
char szText[50];
@@ -96,7 +96,7 @@ class FwkStrCvt {
} else {
m_sText.clear();
}
- };
+ }
/** @brief convert from uint32_t value */
explicit FwkStrCvt(const uint32_t uiValue) {
char szText[50];
@@ -105,7 +105,7 @@ class FwkStrCvt {
} else {
m_sText.clear();
}
- };
+ }
/** @brief convert from int32_t value */
explicit FwkStrCvt(const int32_t iValue) {
char szText[50];
@@ -114,11 +114,11 @@ class FwkStrCvt {
} else {
m_sText.clear();
}
- };
+ }
/** @brief convert from bool value */
explicit FwkStrCvt(const bool bValue) {
m_sText = (bValue) ? "true" : "false";
- };
+ }
/** @brief convert from uint64_t value */
explicit FwkStrCvt(const uint64_t uiValue) {
@@ -141,48 +141,48 @@ class FwkStrCvt {
}
/** @brief gets double value */
- double toDouble() { return ACE_OS::strtod(m_sText.c_str(), nullptr); };
+ double toDouble() { return ACE_OS::strtod(m_sText.c_str(), nullptr); }
/** @brief gets float value */
float toFloat() {
return static_cast<float>(ACE_OS::strtod(m_sText.c_str(), nullptr));
- };
+ }
/** @brief gets int32_t value */
- int32_t toInt() { return ACE_OS::atoi(m_sText.c_str()); };
+ int32_t toInt() { return ACE_OS::atoi(m_sText.c_str()); }
/** @brief gets uint32_t value */
uint32_t toUint() {
return static_cast<uint32_t>(ACE_OS::atoi(m_sText.c_str()));
- };
+ }
/** @brief gets int32_t value */
// TODO: : why this returns in32_t? if so why different from toInt()
- int32_t toLong() { return toInt(); };
+ int32_t toLong() { return toInt(); }
/** @brief gets uint32_t value */
// TODO: : why this returns uin32_t? if so why different from toUInt()
- uint32_t toUlong() { return toUint(); };
+ uint32_t toUlong() { return toUint(); }
/** @brief gets int32_t value */
- int32_t toInt32() { return toInt(); };
+ int32_t toInt32() { return toInt(); }
/** @brief gets uint32_t value */
- uint32_t toUInt32() { return toUint(); };
+ uint32_t toUInt32() { return toUint(); }
/** @brief gets uint64_t value */
uint64_t toUInt64() {
uint64_t uiValue = 0;
sscanf(m_sText.c_str(), UInt64_FMT, &uiValue);
return uiValue;
- };
+ }
/** @brief gets int64_t value */
int64_t toInt64() {
int64_t iValue = 0;
sscanf(m_sText.c_str(), Int64_FMT, &iValue);
return iValue;
- };
+ }
/** @brief gets bool value */
bool toBool() {
@@ -199,7 +199,7 @@ class FwkStrCvt {
return 0.0;
}
return static_cast<float>(ACE_OS::strtod(value, nullptr));
- };
+ }
/** @brief gets float value */
static float toFloat(const std::string& value) {
@@ -207,7 +207,7 @@ class FwkStrCvt {
return -1.0;
}
return FwkStrCvt::toFloat(value.c_str());
- };
+ }
/** @brief gets double value */
static double toDouble(const char* value) {
@@ -215,7 +215,7 @@ class FwkStrCvt {
return 0.0;
}
return ACE_OS::strtod(value, nullptr);
- };
+ }
/** @brief gets double value */
static double toDouble(const std::string& value) {
@@ -223,7 +223,7 @@ class FwkStrCvt {
return -1.0;
}
return FwkStrCvt::toDouble(value.c_str());
- };
+ }
/** @brief gets int32_t value */
static int32_t toInt32(const char* value) {
@@ -231,7 +231,7 @@ class FwkStrCvt {
return 0;
}
return ACE_OS::atoi(value);
- };
+ }
/** @brief gets int32_t value */
static int32_t toInt32(const std::string& value) {
@@ -239,13 +239,13 @@ class FwkStrCvt {
return -1;
}
return ACE_OS::atoi(value.c_str());
- };
+ }
/** @brief gets uint32_t value */
static uint32_t toUInt32(const char* value) {
if (!value) return 0;
return static_cast<uint32_t>(ACE_OS::atoi(value));
- };
+ }
/** @brief gets uint32_t value */
static uint32_t toUInt32(const std::string& value) {
@@ -253,7 +253,7 @@ class FwkStrCvt {
return 0;
}
return static_cast<uint32_t>(ACE_OS::atoi(value.c_str()));
- };
+ }
/** @brief gets uint64_t value */
static uint64_t toUInt64(const std::string& value) {
@@ -261,7 +261,7 @@ class FwkStrCvt {
return 0;
}
return toUInt64(value.c_str());
- };
+ }
/** @brief gets uint64_t value */
static uint64_t toUInt64(const char* value) {
@@ -269,7 +269,7 @@ class FwkStrCvt {
if (!value) return uiValue;
sscanf(value, UInt64_FMT, &uiValue);
return uiValue;
- };
+ }
/** @brief gets int64_t value */
static int64_t toInt64(const std::string& value) {
@@ -277,7 +277,7 @@ class FwkStrCvt {
return 0;
}
return toInt64(value.c_str());
- };
+ }
/** @brief gets int64_t value */
static int64_t toInt64(const char* value) {
@@ -287,7 +287,7 @@ class FwkStrCvt {
}
sscanf(value, Int64_FMT, &iValue);
return iValue;
- };
+ }
/** @brief from int64_t value */
static std::string toString(int64_t value) {
@@ -334,13 +334,13 @@ class FwkStrCvt {
static int32_t toSeconds(const char* str);
/** @brief gets string value */
- std::string& toString() { return m_sText; };
+ std::string& toString() { return m_sText; }
/** @brief gets string value */
- const std::string& asString() { return m_sText; };
+ const std::string& asString() { return m_sText; }
/** @brief gets char * value */
- const char* asChar() { return m_sText.c_str(); };
+ const char* asChar() { return m_sText.c_str(); }
private:
static int32_t asSeconds(int32_t val, char typ);
diff --git a/tests/cpp/security/CredentialGenerator.hpp
b/tests/cpp/security/CredentialGenerator.hpp
index d324bda..e96f488 100644
--- a/tests/cpp/security/CredentialGenerator.hpp
+++ b/tests/cpp/security/CredentialGenerator.hpp
@@ -93,10 +93,10 @@ class CredentialGenerator {
std::string m_name;
static registeredClassMap* generatormap;
- CredentialGenerator() : m_id(ID_NONE), m_name("NONE"){};
+ CredentialGenerator() : m_id(ID_NONE), m_name("NONE") {}
protected:
- CredentialGenerator(ID id, std::string name) : m_id(id), m_name(name){};
+ CredentialGenerator(ID id, std::string name) : m_id(id), m_name(name) {}
CredentialGenerator(const CredentialGenerator& other)
: m_id(other.m_id), m_name(other.m_name) {}
@@ -115,7 +115,7 @@ class CredentialGenerator {
return false;
}
return (m_id == other->m_id && m_name == other->m_name);
- };
+ }
public:
static std::shared_ptr<CredentialGenerator> create(std::string scheme);
@@ -153,7 +153,7 @@ class CredentialGenerator {
}
}
- void hashCode(){};
+ void hashCode() {}
void getAuthInit(std::shared_ptr<Properties>& prop) {
std::string authinit = this->getClientAuthInitLoaderFactory();
diff --git a/tests/cpp/security/DummyCredentialGenerator.hpp
b/tests/cpp/security/DummyCredentialGenerator.hpp
index 9d06ecf..ac9e258 100644
--- a/tests/cpp/security/DummyCredentialGenerator.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator.hpp
@@ -34,7 +34,7 @@ class DummyCredentialGenerator : public CredentialGenerator {
DummyCredentialGenerator() : CredentialGenerator(ID_DUMMY, "DUMMY") {
;
;
- };
+ }
std::string getInitArgs(std::string workingDir, bool userMode) override {
std::string additionalArgs;
diff --git a/tests/cpp/security/PkcsCredentialGenerator.hpp
b/tests/cpp/security/PkcsCredentialGenerator.hpp
index 5c87c4f..f21a3d6 100644
--- a/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -48,7 +48,7 @@ T randomValue(T minValue, T maxValue) {
class PKCSCredentialGenerator : public CredentialGenerator {
public:
- PKCSCredentialGenerator() : CredentialGenerator(ID_PKI, "PKCS"){};
+ PKCSCredentialGenerator() : CredentialGenerator(ID_PKI, "PKCS") {}
std::string getInitArgs(std::string workingDir, bool) override {
FWKINFO("Inside PKCS credentials");
diff --git a/tests/cpp/testobject/PdxType.hpp b/tests/cpp/testobject/PdxType.hpp
index 8b7d5b9..a70fde4 100644
--- a/tests/cpp/testobject/PdxType.hpp
+++ b/tests/cpp/testobject/PdxType.hpp
@@ -628,7 +628,7 @@ class TESTOBJECT_EXPORT PdxType : public PdxSerializable {
for (auto i = 0; i <= 9; i++) {
_GEODE_SAFE_DELETE(m_add[i]);
}
- };
+ }
virtual size_t objectSize() const override {
auto objectSize = sizeof(PdxType);
