You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/06/22 18:01:25 UTC
[2/9] geode-native git commit: GEODE-2741: Removes last of
SharedPtr/SharedBase.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ProxyRemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRemoteQueryService.hpp b/src/cppcache/src/ProxyRemoteQueryService.hpp
index dcc36b6..e1c1f40 100644
--- a/src/cppcache/src/ProxyRemoteQueryService.hpp
+++ b/src/cppcache/src/ProxyRemoteQueryService.hpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
#include <geode/geode_globals.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include "CqService.hpp"
#include "UserAttributes.hpp"
#include <geode/QueryService.hpp>
@@ -68,7 +68,7 @@ class CPPCACHE_EXPORT ProxyRemoteQueryService : public QueryService {
friend class ProxyCache;
};
-typedef SharedPtr<ProxyRemoteQueryService> ProxyRemoteQueryServicePtr;
+typedef std::shared_ptr<ProxyRemoteQueryService> ProxyRemoteQueryServicePtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/PutAllPartialResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResult.hpp b/src/cppcache/src/PutAllPartialResult.hpp
index 91854a5..f0ad50f 100644
--- a/src/cppcache/src/PutAllPartialResult.hpp
+++ b/src/cppcache/src/PutAllPartialResult.hpp
@@ -29,7 +29,7 @@ namespace apache {
namespace geode {
namespace client {
class PutAllPartialResult;
-typedef SharedPtr<PutAllPartialResult> PutAllPartialResultPtr;
+typedef std::shared_ptr<PutAllPartialResult> PutAllPartialResultPtr;
class PutAllPartialResult : public Serializable {
private:
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/PutAllPartialResultServerException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index 5989bb4..1457408 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -30,7 +30,7 @@ namespace geode {
namespace client {
class PutAllPartialResultServerException;
-typedef SharedPtr<PutAllPartialResultServerException>
+typedef std::shared_ptr<PutAllPartialResultServerException>
PutAllPartialResultServerExceptionPtr;
/**
@@ -68,37 +68,37 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
CacheableStringPtr getMessage();
/**
- * @brief destructor
- */
+ * @brief destructor
+ */
virtual ~PutAllPartialResultServerException() {}
/**
- * @brief constructors
- */
+ * @brief constructors
+ */
PutAllPartialResultServerException(CacheableStringPtr msg);
/**
- *@brief serialize this object
- * @throws IllegalStateException If this api is called from User code.
- **/
+ *@brief serialize this object
+ * @throws IllegalStateException If this api is called from User code.
+ **/
virtual void toData(DataOutput& output) const;
/**
- *@brief deserialize this object, typical implementation should return
- * the 'this' pointer.
- * @throws IllegalStateException If this api is called from User code.
- **/
+ *@brief deserialize this object, typical implementation should return
+ * the 'this' pointer.
+ * @throws IllegalStateException If this api is called from User code.
+ **/
virtual Serializable* fromData(DataInput& input);
/**
- *@brief Return the classId of the instance being serialized.
- * This is used by deserialization to determine what instance
- * type to create and deserialize into.
- *
- * The classId must be unique within an application suite.
- * Using a negative value may result in undefined behavior.
- * @throws IllegalStateException If this api is called from User code.
- */
+ *@brief Return the classId of the instance being serialized.
+ * This is used by deserialization to determine what instance
+ * type to create and deserialize into.
+ *
+ * The classId must be unique within an application suite.
+ * Using a negative value may result in undefined behavior.
+ * @throws IllegalStateException If this api is called from User code.
+ */
virtual int32_t classId() const;
/**
@@ -109,7 +109,7 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
* cache memory utilization.
* Note that you must implement this only if you use the HeapLRU feature.
* @throws IllegalStateException If this api is called from User code.
- */
+ */
virtual uint32_t objectSize() const;
/**
@@ -123,9 +123,9 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
virtual int8_t typeId() const;
/**
- *@brief return as CacheableStringPtr the Exception name returned from geode
- *sendException api.
- **/
+ *@brief return as CacheableStringPtr the Exception name returned from geode
+ *sendException api.
+ **/
CacheableStringPtr getName() {
const char* msg = "PutAllPartialResultServerException";
CacheableStringPtr str = CacheableString::create(msg);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/QueueConnectionResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.hpp b/src/cppcache/src/QueueConnectionResponse.hpp
index d46a3a3..4023c18 100644
--- a/src/cppcache/src/QueueConnectionResponse.hpp
+++ b/src/cppcache/src/QueueConnectionResponse.hpp
@@ -48,7 +48,7 @@ class QueueConnectionResponse : public ServerLocationResponse {
std::list<ServerLocation> m_list;
bool m_durableQueueFound;
};
-typedef SharedPtr<QueueConnectionResponse> QueueConnectionResponsePtr;
+typedef std::shared_ptr<QueueConnectionResponse> QueueConnectionResponsePtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/RegionCommit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.hpp b/src/cppcache/src/RegionCommit.hpp
index 2de98b3..9458bee 100644
--- a/src/cppcache/src/RegionCommit.hpp
+++ b/src/cppcache/src/RegionCommit.hpp
@@ -27,9 +27,7 @@
*/
#include <geode/geode_types.hpp>
-#include <geode/SharedBase.hpp>
#include <geode/DataInput.hpp>
-#include <geode/VectorOfSharedBase.hpp>
#include <geode/CacheableString.hpp>
#include <geode/Cache.hpp>
#include <vector>
@@ -41,7 +39,7 @@ namespace client {
_GF_PTR_DEF_(RegionCommit, RegionCommitPtr);
-class RegionCommit : public apache::geode::client::SharedBase {
+class RegionCommit {
public:
RegionCommit(){};
virtual ~RegionCommit(){};
@@ -56,7 +54,7 @@ class RegionCommit : public apache::geode::client::SharedBase {
private:
CacheableStringPtr m_regionPath;
CacheableStringPtr m_parentRegionPath;
- VectorOfSharedBase m_farSideEntryOps;
+ std::vector< std::shared_ptr<FarSideEntryOp> > m_farSideEntryOps;
};
} // namespace client
} // namespace geode
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/RegionConfig.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionConfig.hpp b/src/cppcache/src/RegionConfig.hpp
index 090a355..bbf6fb5 100644
--- a/src/cppcache/src/RegionConfig.hpp
+++ b/src/cppcache/src/RegionConfig.hpp
@@ -27,7 +27,7 @@
//
//////////////////////////////////////////////////////////////////////
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include <string>
#include <geode/Properties.hpp>
@@ -38,9 +38,9 @@ namespace geode {
namespace client {
class RegionConfig;
-typedef SharedPtr<RegionConfig> RegionConfigPtr;
+typedef std::shared_ptr<RegionConfig> RegionConfigPtr;
-class CPPCACHE_EXPORT RegionConfig : virtual public SharedBase {
+class CPPCACHE_EXPORT RegionConfig {
public:
RegionConfig(const std::string& s, const std::string& c);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/RegionInternal.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionInternal.hpp b/src/cppcache/src/RegionInternal.hpp
index bf5a5ee..1b8c639 100644
--- a/src/cppcache/src/RegionInternal.hpp
+++ b/src/cppcache/src/RegionInternal.hpp
@@ -112,9 +112,9 @@ class CacheEventFlags {
};
class TombstoneList;
-typedef SharedPtr<TombstoneList> TombstoneListPtr;
+typedef std::shared_ptr<TombstoneList> TombstoneListPtr;
class VersionTag;
-typedef SharedPtr<VersionTag> VersionTagPtr;
+typedef std::shared_ptr<VersionTag> VersionTagPtr;
_GF_PTR_DEF_(MapEntryImpl, MapEntryImplPtr);
/**
* @class RegionInternal RegionInternal.hpp
@@ -292,7 +292,7 @@ class RegionInternal : public Region {
RegionInternal& operator=(const RegionInternal&);
};
-typedef SharedPtr<RegionInternal> RegionInternalPtr;
+typedef std::shared_ptr<RegionInternal> RegionInternalPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/RemoteQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQuery.hpp b/src/cppcache/src/RemoteQuery.hpp
index 3a44ce3..3140163 100644
--- a/src/cppcache/src/RemoteQuery.hpp
+++ b/src/cppcache/src/RemoteQuery.hpp
@@ -23,7 +23,7 @@
#include <geode/geode_globals.hpp>
#include <geode/geode_types.hpp>
#include <geode/ExceptionTypes.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include <geode/Query.hpp>
#include <geode/SelectResults.hpp>
@@ -80,7 +80,7 @@ class CPPCACHE_EXPORT RemoteQuery : public Query {
bool isCompiled();
};
-typedef SharedPtr<RemoteQuery> RemoteQueryPtr;
+typedef std::shared_ptr<RemoteQuery> RemoteQueryPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/RemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQueryService.hpp b/src/cppcache/src/RemoteQueryService.hpp
index c5bf8fb..ec9567d 100644
--- a/src/cppcache/src/RemoteQueryService.hpp
+++ b/src/cppcache/src/RemoteQueryService.hpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
#include <geode/geode_globals.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include "CqService.hpp"
#include <geode/QueryService.hpp>
@@ -87,7 +87,7 @@ class CPPCACHE_EXPORT RemoteQueryService
CqPoolsConnected m_CqPoolsConnected;
};
-typedef SharedPtr<RemoteQueryService> RemoteQueryServicePtr;
+typedef std::shared_ptr<RemoteQueryService> RemoteQueryServicePtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/SharedPtr.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SharedPtr.cpp b/src/cppcache/src/SharedPtr.cpp
deleted file mode 100644
index 5df113c..0000000
--- a/src/cppcache/src/SharedPtr.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <geode/SharedPtr.hpp>
-#include <geode/ExceptionTypes.hpp>
-#include <Utils.hpp>
-
-#include <string>
-
-using namespace apache::geode::client;
-
-void SPEHelper::throwNullPointerException(const char* ptrtype) {
- throw NullPointerException(Utils::demangleTypeName(ptrtype)->asChar(),
- nullptr, true);
-}
-
-void SPEHelper::throwClassCastException(const char* msg, const char* fromType,
- const char* toType) {
- std::string exMsg(msg);
- exMsg +=
- ((std::string) " from '" + Utils::demangleTypeName(fromType)->asChar() +
- "' to '" + Utils::demangleTypeName(toType)->asChar() + "'.");
- throw ClassCastException(exMsg.c_str());
-}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/StackTrace.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackTrace.hpp b/src/cppcache/src/StackTrace.hpp
index 6e2e147..7aa5155 100644
--- a/src/cppcache/src/StackTrace.hpp
+++ b/src/cppcache/src/StackTrace.hpp
@@ -23,7 +23,7 @@
#define GF_TRACE_LEN 25
#include "StackFrame.hpp"
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include <string>
#include <list>
@@ -32,9 +32,9 @@ namespace geode {
namespace client {
class StackTrace;
-typedef SharedPtr<StackTrace> StackTracePtr;
+typedef std::shared_ptr<StackTrace> StackTracePtr;
#ifdef _WINDOWS
-class StackTrace : public SharedBase {
+class StackTrace {
public:
StackTrace();
virtual ~StackTrace();
@@ -48,7 +48,7 @@ class StackTrace : public SharedBase {
std::list<std::string> m_frames;
};
#else
-class StackTrace : public SharedBase {
+class StackTrace {
StackFrame m_frames[GF_TRACE_LEN];
int m_size;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TXCommitMessage.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCommitMessage.cpp b/src/cppcache/src/TXCommitMessage.cpp
index cdea056..211450f 100644
--- a/src/cppcache/src/TXCommitMessage.cpp
+++ b/src/cppcache/src/TXCommitMessage.cpp
@@ -162,37 +162,13 @@ int8_t TXCommitMessage::typeId() const {
Serializable* TXCommitMessage::create() { return new TXCommitMessage(); }
void TXCommitMessage::apply(Cache* cache) {
- for (VectorOfSharedBase::Iterator iter = m_regions.begin();
+ for (std::vector<RegionCommitPtr>::iterator iter = m_regions.begin();
m_regions.end() != iter; iter++) {
- RegionCommitPtr regionCommit =
- std::static_pointer_cast<GF_UNWRAP_SP(RegionCommitPtr)>(*iter);
+ RegionCommitPtr regionCommit = std::static_pointer_cast<RegionCommit>(*iter);
regionCommit->apply(cache);
}
}
-/*
-VectorOfEntryEvent TXCommitMessage::getEvents(Cache* cache)
-{
- VectorOfEntryEvent events;
- std::vector<FarSideEntryOpPtr> ops;
- for(VectorOfSharedBase::Iterator iter = m_regions.begin();
-m_regions.end() != iter; iter++)
- {
- RegionCommitPtr regionCommit =
-std::static_pointer_cast<GF_UNWRAP_SP(RegionCommitPtr)>(*iter);
- regionCommit->fillEvents(cache, ops);
- }
-
- std::sort(ops.begin(), ops.end(), FarSideEntryOp::cmp);
-
- for(std::vector<FarSideEntryOpPtr>::iterator iter = ops.begin();
-ops.end() != iter; iter++)
- {
- events.push_back((*iter)->getEntryEvent(cache));
- }
-
- return events;
-}
-*/
+
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TXCommitMessage.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCommitMessage.hpp b/src/cppcache/src/TXCommitMessage.hpp
index 0a183c6..eb1b89b 100644
--- a/src/cppcache/src/TXCommitMessage.hpp
+++ b/src/cppcache/src/TXCommitMessage.hpp
@@ -19,18 +19,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * TXCommitMessage.hpp
- *
- * Created on: 21-Feb-2011
- * Author: ankurs
- */
#include <geode/geode_globals.hpp>
#include <geode/geode_types.hpp>
#include <geode/DataInput.hpp>
#include "RegionCommit.hpp"
-#include <geode/VectorOfSharedBase.hpp>
namespace apache {
namespace geode {
@@ -55,7 +48,7 @@ class TXCommitMessage : public apache::geode::client::Cacheable {
// UNUSED int32_t m_processorId;
bool isAckRequired();
- VectorOfSharedBase m_regions;
+ std::vector<RegionCommitPtr> m_regions;
};
} // namespace client
} // namespace geode
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TXEntryState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXEntryState.hpp b/src/cppcache/src/TXEntryState.hpp
index 8e7f36b..702e7c5 100644
--- a/src/cppcache/src/TXEntryState.hpp
+++ b/src/cppcache/src/TXEntryState.hpp
@@ -34,7 +34,7 @@ namespace apache {
namespace geode {
namespace client {
-class TXEntryState : public apache::geode::client::SharedBase {
+class TXEntryState {
public:
TXEntryState();
virtual ~TXEntryState();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TcrChunkedContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrChunkedContext.hpp b/src/cppcache/src/TcrChunkedContext.hpp
index 94a4e15..c07c22c 100644
--- a/src/cppcache/src/TcrChunkedContext.hpp
+++ b/src/cppcache/src/TcrChunkedContext.hpp
@@ -41,7 +41,7 @@ namespace client {
* Base class for holding chunked results, processing a chunk
* and signalling end of chunks using semaphore.
*/
-class TcrChunkedResult : public SharedBase {
+class TcrChunkedResult {
private:
ACE_Semaphore* m_finalizeSema;
ExceptionPtr m_ex;
@@ -62,7 +62,7 @@ class TcrChunkedResult : public SharedBase {
m_inSameThread(false),
appDomainContext(createAppDomainContext()),
m_dsmemId(0) {}
-
+ virtual ~TcrChunkedResult() {}
void setFinalizeSemaphore(ACE_Semaphore* finalizeSema) {
m_finalizeSema = finalizeSema;
}
@@ -124,7 +124,7 @@ class TcrChunkedResult : public SharedBase {
inline ExceptionPtr& getException() { return m_ex; }
};
-typedef SharedPtr<TcrChunkedResult> TcrChunkedResultPtr;
+typedef std::shared_ptr<TcrChunkedResult> TcrChunkedResultPtr;
/**
* Holds the context for a chunk including the chunk bytes, length and the
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientCacheDistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientCacheDistributionManager.hpp b/src/cppcache/src/ThinClientCacheDistributionManager.hpp
index 15c7491..1d859a9 100644
--- a/src/cppcache/src/ThinClientCacheDistributionManager.hpp
+++ b/src/cppcache/src/ThinClientCacheDistributionManager.hpp
@@ -21,7 +21,7 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include "ThinClientDistributionManager.hpp"
namespace apache {
@@ -34,8 +34,7 @@ class TcrMessage;
class TcrConnection;
class CPPCACHE_EXPORT ThinClientCacheDistributionManager
- : public ThinClientDistributionManager,
- public SharedBase {
+ : public ThinClientDistributionManager {
public:
ThinClientCacheDistributionManager(TcrConnectionManager& connManager);
~ThinClientCacheDistributionManager(){};
@@ -60,7 +59,7 @@ class CPPCACHE_EXPORT ThinClientCacheDistributionManager
const ThinClientCacheDistributionManager&);
};
-typedef SharedPtr<ThinClientCacheDistributionManager>
+typedef std::shared_ptr<ThinClientCacheDistributionManager>
ThinClientCacheDistributionManagerPtr;
} // namespace client
} // namespace geode
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientPoolDM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolDM.hpp b/src/cppcache/src/ThinClientPoolDM.hpp
index 0fb8a52..cc5d41e 100644
--- a/src/cppcache/src/ThinClientPoolDM.hpp
+++ b/src/cppcache/src/ThinClientPoolDM.hpp
@@ -432,7 +432,7 @@ class ThinClientPoolDM
int m_primaryServerQueueSize;
};
-typedef SharedPtr<ThinClientPoolDM> ThinClientPoolDMPtr;
+typedef std::shared_ptr<ThinClientPoolDM> ThinClientPoolDMPtr;
class FunctionExecution : public PooledWork<GfErrType> {
ThinClientPoolDM* m_poolDM;
TcrEndpoint* m_ep;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientPoolHADM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolHADM.hpp b/src/cppcache/src/ThinClientPoolHADM.hpp
index a286d3e..9783293 100644
--- a/src/cppcache/src/ThinClientPoolHADM.hpp
+++ b/src/cppcache/src/ThinClientPoolHADM.hpp
@@ -144,7 +144,7 @@ class ThinClientPoolHADM : public ThinClientPoolDM {
friend class ThinClientRedundancyManager;
static const char* NC_Redundancy;
};
-typedef SharedPtr<ThinClientPoolHADM> ThinClientPoolHADMPtr;
+typedef std::shared_ptr<ThinClientPoolHADM> ThinClientPoolHADMPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientPoolStickyDM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolStickyDM.hpp b/src/cppcache/src/ThinClientPoolStickyDM.hpp
index 5fbd4d2..7ad228b 100644
--- a/src/cppcache/src/ThinClientPoolStickyDM.hpp
+++ b/src/cppcache/src/ThinClientPoolStickyDM.hpp
@@ -52,7 +52,7 @@ class ThinClientPoolStickyDM : public ThinClientPoolDM {
// virtual void cleanStickyConnections(volatile bool& isRunning);
};
-typedef SharedPtr<ThinClientPoolStickyDM> ThinClientPoolStickyDMPtr;
+typedef std::shared_ptr<ThinClientPoolStickyDM> ThinClientPoolStickyDMPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientPoolStickyHADM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolStickyHADM.hpp b/src/cppcache/src/ThinClientPoolStickyHADM.hpp
index e6c25ad..40c1694 100644
--- a/src/cppcache/src/ThinClientPoolStickyHADM.hpp
+++ b/src/cppcache/src/ThinClientPoolStickyHADM.hpp
@@ -53,7 +53,7 @@ isTransaction = false );
// virtual void cleanStickyConnections(volatile bool& isRunning);
// ThinClientStickyManager* m_manager;
};
-typedef SharedPtr<ThinClientPoolStickyHADM> ThinClientPoolStickyHADMPtr;
+typedef std::shared_ptr<ThinClientPoolStickyHADM> ThinClientPoolStickyHADMPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientRegion.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientRegion.cpp b/src/cppcache/src/ThinClientRegion.cpp
index 9b15e6e..b7a2dcb 100644
--- a/src/cppcache/src/ThinClientRegion.cpp
+++ b/src/cppcache/src/ThinClientRegion.cpp
@@ -2034,7 +2034,7 @@ uint32_t ThinClientRegion::size_remote() {
switch (reply.getMessageType()) {
case TcrMessage::RESPONSE: {
CacheableInt32Ptr size =
- std::static_pointer_cast<GF_UNWRAP_SP(CacheableInt32Ptr)>(
+ std::static_pointer_cast<CacheableInt32>(
reply.getValue());
return size->value();
// LOGINFO("Map is written into remote server at region %s",
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/ThinClientRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientRegion.hpp b/src/cppcache/src/ThinClientRegion.hpp
index d9ca46c..e52845e 100644
--- a/src/cppcache/src/ThinClientRegion.hpp
+++ b/src/cppcache/src/ThinClientRegion.hpp
@@ -370,7 +370,7 @@ class ChunkedInterestResponse : public TcrChunkedResult {
virtual void reset();
};
-typedef SharedPtr<ChunkedInterestResponse> ChunkedInterestResponsePtr;
+typedef std::shared_ptr<ChunkedInterestResponse> ChunkedInterestResponsePtr;
/**
* Handle each chunk of the chunked query response.
@@ -410,7 +410,7 @@ class ChunkedQueryResponse : public TcrChunkedResult {
void readObjectPartList(DataInput& input, bool isResultSet);
};
-typedef SharedPtr<ChunkedQueryResponse> ChunkedQueryResponsePtr;
+typedef std::shared_ptr<ChunkedQueryResponse> ChunkedQueryResponsePtr;
/**
* Handle each chunk of the chunked function execution response.
*
@@ -458,7 +458,7 @@ class ChunkedFunctionExecutionResponse : public TcrChunkedResult {
uint8_t isLastChunkWithSecurity);
virtual void reset();
};
-typedef SharedPtr<ChunkedFunctionExecutionResponse>
+typedef std::shared_ptr<ChunkedFunctionExecutionResponse>
ChunkedFunctionExecutionResponsePtr;
/**
@@ -518,7 +518,7 @@ class ChunkedGetAllResponse : public TcrChunkedResult {
ACE_Recursive_Thread_Mutex& getResponseLock() { return m_responseLock; }
};
-typedef SharedPtr<ChunkedGetAllResponse> ChunkedGetAllResponsePtr;
+typedef std::shared_ptr<ChunkedGetAllResponse> ChunkedGetAllResponsePtr;
/**
* Handle each chunk of the chunked putAll response.
@@ -550,7 +550,7 @@ class ChunkedPutAllResponse : public TcrChunkedResult {
ACE_Recursive_Thread_Mutex& getResponseLock() { return m_responseLock; }
};
-typedef SharedPtr<ChunkedPutAllResponse> ChunkedPutAllResponsePtr;
+typedef std::shared_ptr<ChunkedPutAllResponse> ChunkedPutAllResponsePtr;
/**
* Handle each chunk of the chunked removeAll response.
@@ -582,7 +582,7 @@ class ChunkedRemoveAllResponse : public TcrChunkedResult {
ACE_Recursive_Thread_Mutex& getResponseLock() { return m_responseLock; }
};
-typedef SharedPtr<ChunkedRemoveAllResponse> ChunkedRemoveAllResponsePtr;
+typedef std::shared_ptr<ChunkedRemoveAllResponse> ChunkedRemoveAllResponsePtr;
/**
* Handle each chunk of the chunked interest registration response.
@@ -613,7 +613,7 @@ class ChunkedKeySetResponse : public TcrChunkedResult {
virtual void reset();
};
-typedef SharedPtr<ChunkedKeySetResponse> ChunkedKeySetResponsePtr;
+typedef std::shared_ptr<ChunkedKeySetResponse> ChunkedKeySetResponsePtr;
class ChunkedDurableCQListResponse : public TcrChunkedResult {
private:
@@ -636,7 +636,8 @@ class ChunkedDurableCQListResponse : public TcrChunkedResult {
virtual void reset();
};
-typedef SharedPtr<ChunkedDurableCQListResponse> ChunkedDurableCQListResponsePtr;
+typedef std::shared_ptr<ChunkedDurableCQListResponse>
+ ChunkedDurableCQListResponsePtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TombstoneList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TombstoneList.hpp b/src/cppcache/src/TombstoneList.hpp
index 98ed643..66260c1 100644
--- a/src/cppcache/src/TombstoneList.hpp
+++ b/src/cppcache/src/TombstoneList.hpp
@@ -26,7 +26,7 @@
#include <ace/Recursive_Thread_Mutex.h>
#include <ace/Guard_T.h>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include <geode/CacheableBuiltins.hpp>
#include <geode/utils.hpp>
@@ -37,7 +37,7 @@ namespace geode {
namespace client {
class MapSegment;
class TombstoneExpiryHandler;
-class TombstoneEntry : public SharedBase {
+class TombstoneEntry {
public:
TombstoneEntry(const MapEntryImplPtr& entry, int64_t tombstoneCreationTime)
: m_entry(entry),
@@ -68,9 +68,9 @@ class TombstoneEntry : public SharedBase {
ExpiryTaskManager::id_type m_expiryTaskId;
TombstoneExpiryHandler* m_handler;
};
-typedef SharedPtr<TombstoneEntry> TombstoneEntryPtr;
+typedef std::shared_ptr<TombstoneEntry> TombstoneEntryPtr;
-class TombstoneList : public SharedBase {
+class TombstoneList {
public:
TombstoneList(MapSegment* mapSegment) { m_mapSegment = mapSegment; }
virtual ~TombstoneList() { cleanUp(); }
@@ -105,7 +105,7 @@ class TombstoneList : public SharedBase {
MapSegment* m_mapSegment;
friend class TombstoneExpiryHandler;
};
-typedef SharedPtr<TombstoneList> TombstoneListPtr;
+typedef std::shared_ptr<TombstoneList> TombstoneListPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TransactionalOperation.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TransactionalOperation.cpp b/src/cppcache/src/TransactionalOperation.cpp
index ffebeaf..15ade7c 100644
--- a/src/cppcache/src/TransactionalOperation.cpp
+++ b/src/cppcache/src/TransactionalOperation.cpp
@@ -68,12 +68,10 @@ CacheablePtr TransactionalOperation::replay(Cache* cache) {
} else {
execution = FunctionService::onRegion(cache->getRegion(m_regionName));
}
- // TODO shared_ptr no clear path between types.
result = std::dynamic_pointer_cast<Cacheable>(
execution->withArgs(m_arguments->at(0))
->withFilter(
std::static_pointer_cast<CacheableVector>(m_arguments->at(1)))
- // TODO shared_ptr - no path between types?
->withCollector(std::dynamic_pointer_cast<ResultCollector>(
m_arguments->at(2)))
->execute(
@@ -91,12 +89,9 @@ CacheablePtr TransactionalOperation::replay(Cache* cache) {
case GF_GET_ALL:
cache->getRegion(m_regionName)
->getAll(
- // TODO shared_ptr - no path between types?
*std::dynamic_pointer_cast<VectorOfCacheableKey>(
m_arguments->at(0)),
- // TODO shared_ptr - no path between types?
std::dynamic_pointer_cast<HashMapOfCacheable>(m_arguments->at(1)),
- // TODO shared_ptr - no path between types?
std::dynamic_pointer_cast<HashMapOfException>(m_arguments->at(2)),
std::static_pointer_cast<CacheableBoolean>(m_arguments->at(3))
->value());
@@ -109,9 +104,7 @@ CacheablePtr TransactionalOperation::replay(Cache* cache) {
->remove(m_key, m_arguments->at(0), m_arguments->at(1));
break;
case GF_KEY_SET:
- cache
- ->getRegion(m_regionName)
- // TODO shared_ptr - no path between types?
+ cache->getRegion(m_regionName)
->serverKeys(*std::dynamic_pointer_cast<VectorOfCacheableKey>(
m_arguments->at(0)));
break;
@@ -124,9 +117,7 @@ CacheablePtr TransactionalOperation::replay(Cache* cache) {
->put(m_key, m_arguments->at(0), m_arguments->at(1));
break;
case GF_PUT_ALL:
- cache
- ->getRegion(m_regionName)
- // TODO shared_ptr - no path between types?
+ cache->getRegion(m_regionName)
->putAll(*std::dynamic_pointer_cast<HashMapOfCacheable>(
m_arguments->at(0)),
std::static_pointer_cast<CacheableInt32>(m_arguments->at(1))
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/TransactionalOperation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TransactionalOperation.hpp b/src/cppcache/src/TransactionalOperation.hpp
index b9df719..3fd9a1e 100644
--- a/src/cppcache/src/TransactionalOperation.hpp
+++ b/src/cppcache/src/TransactionalOperation.hpp
@@ -54,7 +54,7 @@ enum ServerRegionOperation {
_GF_PTR_DEF_(TransactionalOperation, TransactionalOperationPtr);
-class TransactionalOperation : public apache::geode::client::SharedBase {
+class TransactionalOperation {
public:
TransactionalOperation(ServerRegionOperation op, const char* regionName,
CacheableKeyPtr key, VectorOfCacheablePtr arguments);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/UserAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/UserAttributes.hpp b/src/cppcache/src/UserAttributes.hpp
index 7193cee..3ddfd2a 100644
--- a/src/cppcache/src/UserAttributes.hpp
+++ b/src/cppcache/src/UserAttributes.hpp
@@ -31,7 +31,7 @@ namespace apache {
namespace geode {
namespace client {
class ProxyCache;
-typedef SharedPtr<ProxyCache> ProxyCachePtr;
+typedef std::shared_ptr<ProxyCache> ProxyCachePtr;
class ThinClientPoolDM;
class UserConnectionAttributes {
public:
@@ -69,7 +69,7 @@ class UserConnectionAttributes {
// UserConnectionAttributes & operator =(const UserConnectionAttributes &);
};
-class CPPCACHE_EXPORT UserAttributes : public SharedBase {
+class CPPCACHE_EXPORT UserAttributes {
// TODO: need to add lock here so that user should not be authenticated at two
// servers
public:
@@ -120,7 +120,7 @@ class CPPCACHE_EXPORT UserAttributes : public SharedBase {
UserAttributes& operator=(const UserAttributes&);
};
-typedef SharedPtr<UserAttributes> UserAttributesPtr;
+typedef std::shared_ptr<UserAttributes> UserAttributesPtr;
class TSSUserAttributesWrapper {
private:
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/Utils.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Utils.cpp b/src/cppcache/src/Utils.cpp
index b7bb14f..f6f4e61 100644
--- a/src/cppcache/src/Utils.cpp
+++ b/src/cppcache/src/Utils.cpp
@@ -15,40 +15,18 @@
* limitations under the License.
*/
-#include "Utils.hpp"
-#include "ace/OS.h"
-#include "NanoTimer.hpp"
-#include <ace/Recursive_Thread_Mutex.h>
-#include <ace/INET_Addr.h>
#include <cstdio>
-using namespace apache::geode::client;
-
-#ifdef _WIN32
-
-pNew Utils::s_pNew = nullptr;
-pDelete Utils::s_pDelete = nullptr;
-bool Utils::s_setNewAndDelete = false;
-
-void* operator new(size_t size) {
- if (!Utils::s_pNew) {
- apache::geode::client::setDefaultNewAndDelete();
- }
- void* ret = Utils::s_pNew(size);
- if (ret == nullptr) {
- throw apache::geode::client::OutOfMemoryException(
- "Out of memory while executing operator new");
- }
- return ret;
-}
-
-void operator delete(void* p) { Utils::s_pDelete(p); }
-
-void* operator new[](size_t size) { return operator new(size); }
+#include <ace/OS.h>
+#include <ace/Recursive_Thread_Mutex.h>
+#include <ace/INET_Addr.h>
-void operator delete[](void* p) { operator delete(p); }
+#include "Utils.hpp"
+#include "NanoTimer.hpp"
-#endif // _WIN32
+namespace apache {
+namespace geode {
+namespace client {
int RandGen::operator()(size_t max) {
unsigned int seed = static_cast<unsigned int>(NanoTimer::now());
@@ -104,59 +82,6 @@ void Utils::parseEndpointString(const char* endpoints, std::string& host,
port = atoi(endpointsStr.c_str());
}
-/*
-std::string
-Utils::convertHostToCanonicalForm(const char* endpoint)
-{
- ACE_INET_Addr aia;
- char canonical[MAXHOSTNAMELEN + 11] = {0};
-
- if ( endpoint == nullptr ||
- strlen(endpoint) == 0 ) {
- LOGERROR("Cannot convert empty endpoint to canonical form");
- return "";
- }
-
- // first convert the incoming endpoint string to an inet addr
-
- if (aia.string_to_addr(endpoint) != 0) {
- LOGERROR("Could not convert endpoint [%s] to inet addr", endpoint);
- return endpoint;
- }
-
- // if its a loopback address, try to get our hostname
-
- if (aia.is_loopback()) {
- int port = atoi(strchr(endpoint, ':') + 1);
- if (ACE_OS::hostname(canonical, MAXHOSTNAMELEN) == 0) {
- struct hostent * host;
- if ( (host = ACE_OS::gethostbyname(canonical)) != nullptr ) {
- if (h_errno != 0) {
- return endpoint;
- }
- sprintf(canonical, "%s:%d", host->h_name, port);
- if (aia.string_to_addr(canonical) != 0) {
- LOGERROR("Could not convert canonical endpoint [%s] to inet addr",
-canonical);
- return endpoint;
- }
- }
- }
- }
-
- // convert first to FQDN host name, failing which try IP number
-
- if ( aia.addr_to_string(canonical, MAXHOSTNAMELEN + 10, 0) != 0 &&
- aia.addr_to_string(canonical, MAXHOSTNAMELEN + 10, 1) != 0 ) {
- LOGERROR("Could not convert [%s] from inet addr to canonical form",
-endpoint);
- return endpoint;
- }
-
- return canonical;
-}
-*/
-
std::string Utils::convertHostToCanonicalForm(const char* endpoints) {
if (endpoints == nullptr) return nullptr;
std::string hostString("");
@@ -287,3 +212,7 @@ int32_t Utils::logWideString(char* buf, size_t maxLen, const wchar_t* wStr) {
return ACE_OS::snprintf(buf, maxLen, "null");
}
}
+
+} // namespace client
+} // namespace geode
+} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Utils.hpp b/src/cppcache/src/Utils.hpp
index 392bd6d..16904ca 100644
--- a/src/cppcache/src/Utils.hpp
+++ b/src/cppcache/src/Utils.hpp
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef GEODE_UTILS_H_
-#define GEODE_UTILS_H_
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,6 +15,11 @@
* limitations under the License.
*/
+#pragma once
+
+#ifndef GEODE_INTERNAL_UTILS_H_
+#define GEODE_INTERNAL_UTILS_H_
+
/**
* @file
*/
@@ -53,12 +53,6 @@ class CPPCACHE_EXPORT Utils {
*
*/
public:
-#ifdef _WIN32
- static pNew s_pNew;
- static pDelete s_pDelete;
- static bool s_setNewAndDelete;
-#endif
-
/**
* Get the value of an environment variable.
* On windows the maximum length of value supported is 8191.
@@ -225,4 +219,4 @@ class RandGen {
} // namespace geode
} // namespace apache
-#endif // GEODE_UTILS_H_
+#endif // GEODE_INTERNAL_UTILS_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/VectorOfSharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VectorOfSharedBase.cpp b/src/cppcache/src/VectorOfSharedBase.cpp
deleted file mode 100644
index dbc6df7..0000000
--- a/src/cppcache/src/VectorOfSharedBase.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <geode/geode_globals.hpp>
-#include <geode/ExceptionTypes.hpp>
-#include <geode/VectorOfSharedBase.hpp>
-
-#include <vector>
-#include <stdexcept>
-
-namespace apache {
-namespace geode {
-namespace client {
-
-// Iterator methods
-
-VectorOfSharedBase::Iterator::Iterator(const VofSBPIterator& iter) {
- m_iter = new VofSBPIterator(iter);
-}
-
-VectorOfSharedBase::Iterator::Iterator(
- const VectorOfSharedBase::Iterator& other) {
- m_iter = new VofSBPIterator(*(other.m_iter));
-}
-
-const SharedBasePtr VectorOfSharedBase::Iterator::operator*() const {
- return *(*m_iter);
-}
-
-VectorOfSharedBase::Iterator& VectorOfSharedBase::Iterator::operator++() {
- ++(*m_iter);
- return *this;
-}
-
-void VectorOfSharedBase::Iterator::operator++(int) { ++(*m_iter); }
-
-bool VectorOfSharedBase::Iterator::operator==(
- const VectorOfSharedBase::Iterator& other) const {
- return (*m_iter == *other.m_iter);
-}
-
-bool VectorOfSharedBase::Iterator::operator!=(
- const VectorOfSharedBase::Iterator& other) const {
- return (*m_iter != *other.m_iter);
-}
-
-VectorOfSharedBase::Iterator::~Iterator() { delete m_iter; }
-
-// Vector methods
-
-/** return the size of the vector. */
-int32_t VectorOfSharedBase::size() const {
- return static_cast<int32_t>(m_stdvector->size());
-}
-
-/** return the largest possible size of the vector. */
-int32_t VectorOfSharedBase::max_size() const {
- return static_cast<int32_t>(m_stdvector->max_size());
-}
-
-/** return the number of elements allocated for this vector. */
-int32_t VectorOfSharedBase::capacity() const {
- return static_cast<int32_t>(m_stdvector->capacity());
-}
-
-/** return true if the vector's size is 0. */
-bool VectorOfSharedBase::empty() const { return m_stdvector->empty(); }
-
-/** Return the n'th element */
-SharedBasePtr& VectorOfSharedBase::operator[](int32_t n) {
- return m_stdvector->operator[](n);
-}
-
-/** Return the n'th element */
-const SharedBasePtr& VectorOfSharedBase::operator[](int32_t n) const {
- return m_stdvector->operator[](n);
-}
-
-/** Return the n'th element with bounds checkin. */
-SharedBasePtr& VectorOfSharedBase::at(int32_t n) {
- try {
- return m_stdvector->at(n);
- } catch (const std::out_of_range& ex) {
- throw apache::geode::client::OutOfRangeException(ex.what());
- }
-}
-
-/** Return the n'th element with bounds checkin. */
-SharedBasePtr& VectorOfSharedBase::at(int32_t n) const {
- try {
- return m_stdvector->at(n);
- } catch (const std::out_of_range& ex) {
- throw apache::geode::client::OutOfRangeException(ex.what());
- }
-}
-
-/** Get an iterator pointing to the start of vector. */
-VectorOfSharedBase::Iterator VectorOfSharedBase::begin() const {
- return Iterator(m_stdvector->begin());
-}
-
-/** Get an iterator pointing to the end of vector. */
-VectorOfSharedBase::Iterator VectorOfSharedBase::end() const {
- return Iterator(m_stdvector->end());
-}
-
-/** Create an empty vector. */
-VectorOfSharedBase::VectorOfSharedBase() : m_stdvector(nullptr) {
- m_stdvector = new VofSBP();
-}
-
-/** Create a vector with n elements allocated */
-VectorOfSharedBase::VectorOfSharedBase(int32_t n) : m_stdvector(nullptr) {
- m_stdvector = new VofSBP(n);
-}
-
-/** Create a vector with n copies of t */
-VectorOfSharedBase::VectorOfSharedBase(int32_t n, const SharedBasePtr& t)
- : m_stdvector(nullptr) {
- m_stdvector = new VofSBP(n, t);
-}
-
-/** copy constructor */
-VectorOfSharedBase::VectorOfSharedBase(const VectorOfSharedBase& other)
- : m_stdvector(nullptr) {
- m_stdvector = new VofSBP(*(other.m_stdvector));
-}
-
-/** destructor, sets all SharedPtr elements to nullptr */
-VectorOfSharedBase::~VectorOfSharedBase() {
- m_stdvector->clear();
- delete m_stdvector;
-}
-
-/** assignment operator */
-VectorOfSharedBase& VectorOfSharedBase::operator=(
- const VectorOfSharedBase& other) {
- *m_stdvector = *(other.m_stdvector);
- return *this;
-}
-
-/** reallocate a vector to hold n elements. */
-void VectorOfSharedBase::reserve(int32_t n) { m_stdvector->reserve(n); }
-
-/** returns the first element. */
-SharedBasePtr& VectorOfSharedBase::front() { return m_stdvector->front(); }
-
-/** returns the first element. */
-const SharedBasePtr& VectorOfSharedBase::front() const {
- return m_stdvector->front();
-}
-
-/** returns the last element. */
-SharedBasePtr& VectorOfSharedBase::back() { return m_stdvector->back(); }
-
-/** returns the last element. */
-const SharedBasePtr& VectorOfSharedBase::back() const {
- return m_stdvector->back();
-}
-
-/** insert a new element at the end. */
-void VectorOfSharedBase::push_back(const SharedBasePtr& e) {
- m_stdvector->push_back(e);
-}
-
-/** removes the last element. */
-void VectorOfSharedBase::pop_back() { m_stdvector->pop_back(); }
-
-/** swaps the contents of two vectors. */
-void VectorOfSharedBase::swap(VectorOfSharedBase& other) {
- m_stdvector->swap(*(other.m_stdvector));
-}
-
-/** erases all elements. */
-void VectorOfSharedBase::clear() { m_stdvector->clear(); }
-
-/** inserts or erases elements at the end such that size becomes n.
- * Not to be confused with reserve which simply allocates the space,
- * resize fills the space with active elements. */
-void VectorOfSharedBase::resize(int32_t n, const SharedBasePtr& t) {
- m_stdvector->resize(n, t);
-}
-
-void VectorOfSharedBase::insert(int32_t index, const SharedBasePtr& t) {
- if (index < static_cast<int32_t>(m_stdvector->size())) {
- m_stdvector->insert(m_stdvector->begin() + index, t);
- }
-}
-
-void VectorOfSharedBase::erase(int32_t index) {
- if (index < static_cast<int32_t>(m_stdvector->size())) {
- m_stdvector->erase(m_stdvector->begin() + index);
- }
-}
-} // namespace client
-} // namespace geode
-} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/VersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VersionStamp.hpp b/src/cppcache/src/VersionStamp.hpp
index 6855c00..6a58269 100644
--- a/src/cppcache/src/VersionStamp.hpp
+++ b/src/cppcache/src/VersionStamp.hpp
@@ -21,7 +21,7 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include "ClientProxyMembershipID.hpp"
#include "VersionTag.hpp"
@@ -84,7 +84,7 @@ class CPPCACHE_EXPORT VersionStamp {
const int64_t tagVersion,
const VersionTagPtr& tag) const;
};
-typedef SharedPtr<VersionStamp> VersionStampPtr;
+typedef std::shared_ptr<VersionStamp> VersionStampPtr;
} // namespace client
} // namespace geode
} // namespace apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/VersionedCacheableObjectPartList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VersionedCacheableObjectPartList.hpp b/src/cppcache/src/VersionedCacheableObjectPartList.hpp
index a4ed6f0..91b7f3c 100644
--- a/src/cppcache/src/VersionedCacheableObjectPartList.hpp
+++ b/src/cppcache/src/VersionedCacheableObjectPartList.hpp
@@ -56,7 +56,7 @@ class ThinClientRegion;
*/
class VersionedCacheableObjectPartList;
-typedef SharedPtr<VersionedCacheableObjectPartList>
+typedef std::shared_ptr<VersionedCacheableObjectPartList>
VersionedCacheableObjectPartListPtr;
class VersionedCacheableObjectPartList : public CacheableObjectPartList {
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/dllmain.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/dllmain.cpp b/src/cppcache/src/dllmain.cpp
index 9cd30a6..13d62b8 100644
--- a/src/cppcache/src/dllmain.cpp
+++ b/src/cppcache/src/dllmain.cpp
@@ -100,25 +100,3 @@ void DllMainGetPath(char *result, int maxLen) {
#endif /* WIN32 */
} /* extern "C" */
-
-#ifdef _WIN32
-
-namespace apache {
-namespace geode {
-namespace client {
-void CPPCACHE_EXPORT setNewAndDelete(pNew pn, pDelete pd) {
- Utils::s_pNew = pn;
- Utils::s_pDelete = pd;
- Utils::s_setNewAndDelete = true;
-}
-
-void setDefaultNewAndDelete() {
- Utils::s_pNew = (pNew)&malloc; // operator new;
- Utils::s_pDelete = (pDelete)&free; // operator delete;
-}
-
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // _WIN32
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
index 0d6c6e0..710b584 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
@@ -176,18 +176,7 @@ void AtomicStatisticsImpl::_setInt(int32_t offset, int32_t value) {
void AtomicStatisticsImpl::_setLong(int32_t offset, int64_t value) {
if (offset >= statsType->getLongStatCount()) {
char s[128] = {'\0'};
- /* adongre - Coverity II
- * CID 29273: Calling risky function (SECURE_CODING)[VERY RISKY]. Using
- * "sprintf" can cause a
- * buffer overflow when done incorrectly. Because sprintf() assumes an
- * arbitrarily long string,
- * callers must be careful not to overflow the actual space of the
- * destination.
- * Use snprintf() instead, or correct precision specifiers.
- * Fix : using ACE_OS::snprintf
- */
- // sprintf(s, "setLong:The id (%d) of the Statistic Descriptor is not valid
- // ", offset);
+
ACE_OS::snprintf(
s, 128, "setLong:The id (%d) of the Statistic Descriptor is not valid ",
offset);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
index 6ea6fbd..93a1a9c 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
@@ -46,21 +46,6 @@ namespace statistics {
*
*/
-/* adongre
- * CID 28732: Other violation (MISSING_COPY)
- * Class "apache::geode::statistics::AtomicStatisticsImpl" owns resources that
- * are
- * managed
- * in its constructor and destructor but has no user-written copy constructor.
- *
- * CID 28718: Other violation (MISSING_ASSIGN)
- * Class "apache::geode::statistics::AtomicStatisticsImpl" owns resources that
- * are
- * managed in its constructor and destructor but has no user-written assignment
- * operator.
- *
- * FIX : Make the class non-copyable
- */
class AtomicStatisticsImpl : public Statistics, private NonCopyable {
private:
/**********varbs originally kept in statisticsimpl class*****************/
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/test/AutoDeleteTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/AutoDeleteTest.cpp b/src/cppcache/test/AutoDeleteTest.cpp
index a7ad195..21258f6 100644
--- a/src/cppcache/test/AutoDeleteTest.cpp
+++ b/src/cppcache/test/AutoDeleteTest.cpp
@@ -17,13 +17,12 @@
#include <gtest/gtest.h>
-#include <geode/SharedBase.hpp>
#include <AutoDelete.hpp>
using namespace apache::geode::client;
namespace {
-class TestSharedBase : public SharedBase {
+class TestSharedBase {
public:
explicit TestSharedBase(bool& destructed) : m_destructed(destructed) {
// NOP
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/test/DataInputTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/DataInputTest.cpp b/src/cppcache/test/DataInputTest.cpp
index 8c8913c..90727fa 100644
--- a/src/cppcache/test/DataInputTest.cpp
+++ b/src/cppcache/test/DataInputTest.cpp
@@ -25,7 +25,7 @@
#include <geode/DataInput.hpp>
#include <geode/DataOutput.hpp>
-#include <geode/SharedPtr.hpp>
+#include <memory>
#include "ByteArrayFixture.hpp"
using namespace apache::geode::client;
@@ -119,7 +119,7 @@ class TestDataInput {
}
template <class PTR>
- void readObject(SharedPtr<PTR> &ptr,
+ void readObject(std::shared_ptr<PTR> &ptr,
bool throwOnError = DINP_THROWONERROR_DEFAULT) {
m_dataInput.readObject(ptr, throwOnError);
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/cppcache/test/DataOutputTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/DataOutputTest.cpp b/src/cppcache/test/DataOutputTest.cpp
index 214ec93..a3af420 100644
--- a/src/cppcache/test/DataOutputTest.cpp
+++ b/src/cppcache/test/DataOutputTest.cpp
@@ -280,7 +280,7 @@ TEST_F(DataOutputTest, TestEncodedLengthWide) {
TEST_F(DataOutputTest, TestWriteObjectSharedPtr) {
TestDataOutput dataOutput;
- SharedPtr<CacheableString> objptr =
+ std::shared_ptr<CacheableString> objptr =
CacheableString::create("You had me at meat tornado.");
dataOutput.writeObject(objptr);
EXPECT_BYTEARRAY_EQ(
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/Delta.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Delta.cpp b/src/quickstart/cpp/Delta.cpp
index d31885f..dba53a0 100644
--- a/src/quickstart/cpp/Delta.cpp
+++ b/src/quickstart/cpp/Delta.cpp
@@ -42,7 +42,7 @@
using namespace apache::geode::client;
// The Delta QuickStart example.
-typedef SharedPtr<DeltaExample> DeltaExamplePtr;
+typedef std::shared_ptr<DeltaExample> DeltaExamplePtr;
int main(int argc, char** argv) {
try {
// Create a Geode Cache.
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/Portfolio.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Portfolio.hpp b/src/quickstart/cpp/queryobjects/Portfolio.hpp
index a0a46d5..c6f14a0 100644
--- a/src/quickstart/cpp/queryobjects/Portfolio.hpp
+++ b/src/quickstart/cpp/queryobjects/Portfolio.hpp
@@ -125,6 +125,6 @@ class TESTOBJECT_EXPORT Portfolio : public Serializable {
CacheableStringPtr toString() const;
};
-typedef SharedPtr<Portfolio> PortfolioPtr;
-}
+typedef std::shared_ptr<Portfolio> PortfolioPtr;
+} // namespace testobject
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp b/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
index e82e8cb..d48c318 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
@@ -102,6 +102,6 @@ class TESTOBJECT_EXPORT PortfolioPdx : public PdxSerializable {
CacheableStringPtr toString() const;
};
-typedef SharedPtr<PortfolioPdx> PortfolioPdxPtr;
-}
+typedef std::shared_ptr<PortfolioPdx> PortfolioPdxPtr;
+} // namespace testobject
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
index 44decf9..603c71a 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
@@ -106,6 +106,6 @@ class PortfolioPdxAuto : public apache::geode::client::PdxSerializable {
CacheableStringPtr toString() const;
};
-typedef SharedPtr<PortfolioPdxAuto> PortfolioPdxPtr;
+typedef std::shared_ptr<PortfolioPdxAuto> PortfolioPdxPtr;
}
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/Position.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Position.hpp b/src/quickstart/cpp/queryobjects/Position.hpp
index b36486c..aac3c93 100644
--- a/src/quickstart/cpp/queryobjects/Position.hpp
+++ b/src/quickstart/cpp/queryobjects/Position.hpp
@@ -94,6 +94,6 @@ class TESTOBJECT_EXPORT Position : public apache::geode::client::Serializable {
void init();
};
-typedef apache::geode::client::SharedPtr<Position> PositionPtr;
-}
+typedef std::shared_ptr<Position> PositionPtr;
+} // namespace testobject
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/PositionPdx.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdx.hpp b/src/quickstart/cpp/queryobjects/PositionPdx.hpp
index 44be09f..9b371e9 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdx.hpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdx.hpp
@@ -99,6 +99,6 @@ class TESTOBJECT_EXPORT PositionPdx
void init();
};
-typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr;
-}
+typedef std::shared_ptr<PositionPdx> PositionPdxPtr;
+} // namespace testobject
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp b/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
index 50d592d..29e7f9d 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
@@ -100,6 +100,6 @@ class PositionPdxAuto : public apache::geode::client::PdxSerializable {
void init();
};
-typedef apache::geode::client::SharedPtr<PositionPdxAuto> PositionPdxPtr;
+typedef std::shared_ptr<PositionPdxAuto> PositionPdxPtr;
}
#endif
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/fwklib/FrameworkTest.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FrameworkTest.cpp b/src/tests/cpp/fwklib/FrameworkTest.cpp
index 1bb3b4e..83a7948 100644
--- a/src/tests/cpp/fwklib/FrameworkTest.cpp
+++ b/src/tests/cpp/fwklib/FrameworkTest.cpp
@@ -33,9 +33,6 @@ SpinLock FrameworkTest::m_lck;
// ----------------------------------------------------------------------------
FrameworkTest::FrameworkTest(const char* initArgs) {
-#ifdef WIN32
- setNewAndDelete();
-#endif
txManager = nullptr;
// parse args into variables,
char xml[4096]; // xml file name
@@ -225,12 +222,6 @@ const FwkPool* FrameworkTest::getPoolSnippet(const std::string& name) const {
void FrameworkTest::cacheInitialize(PropertiesPtr& props,
const CacheAttributesPtr& cAttrs) {
-#ifdef WIN32
- if (!m_doneSetNewAndDelete) {
- FWKEXCEPTION("SetNewAndDelete() not called via initArgs ctor");
- }
-#endif
-
CacheFactoryPtr cacheFactory;
try {
std::string name = getStringValue("systemName");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/fwklib/FrameworkTest.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FrameworkTest.hpp b/src/tests/cpp/fwklib/FrameworkTest.hpp
index d57c3e4..5856eee 100644
--- a/src/tests/cpp/fwklib/FrameworkTest.hpp
+++ b/src/tests/cpp/fwklib/FrameworkTest.hpp
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef GEODE_FWKLIB_FRAMEWORKTEST_H_
-#define GEODE_FWKLIB_FRAMEWORKTEST_H_
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,12 +15,17 @@
* limitations under the License.
*/
+#pragma once
+
+#ifndef GEODE_FWKLIB_FRAMEWORKTEST_H_
+#define GEODE_FWKLIB_FRAMEWORKTEST_H_
+
+#include <string>
+
#include "fwklib/TimeSync.hpp"
#include "fwklib/ClientTask.hpp"
#include "fwklib/FwkBBClient.hpp"
-#include <string>
-
namespace apache {
namespace geode {
namespace client {
@@ -48,24 +48,7 @@ class FrameworkTest // Base class all test classes written for xml testing
CacheTransactionManagerPtr txManager;
static SpinLock m_lck;
-#ifdef _WIN32
- bool m_doneSetNewAndDelete;
-
- void setNewAndDelete() {
- char* envsetting = ACE_OS::getenv("BUG481");
- if (envsetting != NULL && strlen(envsetting) > 0) {
- apache::geode::client::setNewAndDelete(&operator new, & operator delete);
- FWKINFO("setNewAndDelete() was called");
- }
- m_doneSetNewAndDelete = true;
- }
-#endif
-
public:
-#ifdef _WIN32
- FrameworkTest() : m_doneSetNewAndDelete(false) {}
-#endif
-
FrameworkTest(const char* initArgs);
~FrameworkTest();
@@ -163,113 +146,113 @@ class FrameworkTest // Base class all test classes written for xml testing
}
/** @brief dump all data
- * @param sResult result of dump
- * @retval true = Success, false = Failed
- */
+ * @param sResult result of dump
+ * @retval true = Success, false = Failed
+ */
inline std::string bbDump() const { return m_bbc->dump(); }
/** @brief dump BB data
- * @param pszBBName name of BB
- * @param sResult result of dump
- * @retval true = Success, false = Failed
- */
+ * @param pszBBName name of BB
+ * @param sResult result of dump
+ * @retval true = Success, false = Failed
+ */
inline std::string bbDump(const std::string& bb) const {
return m_bbc->dump(bb);
}
/** @brief clear BB data
- * @param pszBBName name of BB
- * @retval true = Success, false = Failed
- */
+ * @param pszBBName name of BB
+ * @retval true = Success, false = Failed
+ */
inline void bbClear(const std::string& bb) const { m_bbc->clear(bb); }
/** @brief get BB key value
- * @param bb name of BB
- * @param key name of key in BB
- * @retval value from BB
- */
+ * @param bb name of BB
+ * @param key name of key in BB
+ * @retval value from BB
+ */
inline std::string bbGetString(const std::string& bb,
const std::string& key) const {
return m_bbc->getString(bb, key);
}
/** @brief get BB counter value
- * @param bb name of BB
- * @param cntr name of counter
- * @retval value from BB
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @retval value from BB
+ */
inline int64_t bbGet(const std::string& bb, const std::string& cntr) const {
return m_bbc->get(bb, cntr);
}
/** @brief set BB key value
- * @param bb name of BB
- * @param key name of key in BB
- * @param val value to set
- */
+ * @param bb name of BB
+ * @param key name of key in BB
+ * @param val value to set
+ */
inline void bbSet(const std::string& bb, const std::string& key,
const std::string& val) const {
m_bbc->set(bb, key, val);
}
/** @brief set BB counter value
- * @param bb name of BB
- * @param cntr name of counter
- * @param val value to set
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @param val value to set
+ */
inline void bbSet(const std::string& bb, const std::string& cntr,
const int64_t val) const {
m_bbc->set(bb, cntr, val);
}
/** @brief add BB counter value
- * @param bb name of BB
- * @param cntr name of counter
- * @param val value to add to counter
- * @retval value of after add
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @param val value to add to counter
+ * @retval value of after add
+ */
inline int64_t bbAdd(const std::string& bb, const std::string& cntr,
const int64_t val) const {
return m_bbc->add(bb, cntr, val);
}
/** @brief increment BB counter value by 1
- * @param bb name of BB
- * @param cntr name of counter
- * @retval value after increment
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @retval value after increment
+ */
inline int64_t bbIncrement(const std::string& bb,
const std::string& cntr) const {
return m_bbc->increment(bb, cntr);
}
/** @brief decrement BB counter value by 1
- * @param bb name of BB
- * @param cntr name of counter
- * @retval value after decrement
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @retval value after decrement
+ */
inline int64_t bbDecrement(const std::string& bb,
const std::string& cntr) const {
return m_bbc->decrement(bb, cntr);
}
/** @brief setIfGreater BB counter value is greater
- * @param bb name of BB
- * @param cntr name of counter
- * @param val value to set
- * @retval value after setIfGreater
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @param val value to set
+ * @retval value after setIfGreater
+ */
inline int64_t bbSetIfGreater(const std::string& bb, const std::string& cntr,
const int64_t val) const {
return m_bbc->setIfGreater(bb, cntr, val);
}
/** @brief setIfLess BB counter value is less
- * @param bb name of BB
- * @param cntr name of counter
- * @param val value to set
- * @retval value after setIfLess
- */
+ * @param bb name of BB
+ * @param cntr name of counter
+ * @param val value to set
+ * @retval value after setIfLess
+ */
inline int64_t bbSetIfLess(const std::string& bb, const std::string& cntr,
const int64_t val) const {
return m_bbc->setIfLess(bb, cntr, val);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/fwklib/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/QueryHelper.hpp b/src/tests/cpp/fwklib/QueryHelper.hpp
index 8127973..ecf6c1c 100644
--- a/src/tests/cpp/fwklib/QueryHelper.hpp
+++ b/src/tests/cpp/fwklib/QueryHelper.hpp
@@ -1018,7 +1018,7 @@ bool QueryHelper::verifyRS(SelectResultsPtr& resultSet, int expectedRows) {
return false;
}
- ResultSetPtr rsptr = std::static_pointer_cast<GF_UNWRAP_SP(ResultSetPtr)>(resultSet);
+ ResultSetPtr rsptr = std::static_pointer_cast<ResultSet>(resultSet);
int foundRows = 0;
@@ -1048,7 +1048,7 @@ bool QueryHelper::verifySS(SelectResultsPtr& structSet, int expectedRows,
return false;
}
- StructSetPtr ssptr = std::static_pointer_cast<GF_UNWRAP_SP(StructSetPtr)>(structSet);
+ StructSetPtr ssptr = std::static_pointer_cast<StructSet>(structSet);
int foundRows = 0;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/security/CredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/CredentialGenerator.hpp b/src/tests/cpp/security/CredentialGenerator.hpp
index de77aaf..b0f5042 100644
--- a/src/tests/cpp/security/CredentialGenerator.hpp
+++ b/src/tests/cpp/security/CredentialGenerator.hpp
@@ -21,18 +21,17 @@
*/
/**
- * @file CredentialGenerator.hpp
- * @since 1.0
- * @version 1.0
- * @see
- *
- */
+ * @file CredentialGenerator.hpp
+ * @since 1.0
+ * @version 1.0
+ * @see
+ *
+ */
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-#include <geode/SharedBase.hpp>
#include <geode/Properties.hpp>
#ifndef __COMPILE_DUNIT_
@@ -59,7 +58,7 @@ namespace testframework {
namespace security {
class CredentialGenerator;
-typedef SharedPtr<CredentialGenerator> CredentialGeneratorPtr;
+typedef std::shared_ptr<CredentialGenerator> CredentialGeneratorPtr;
/**
* @class CredentialGenerator CredentialGenerator.hpp
@@ -85,7 +84,7 @@ typedef SharedPtr<CredentialGenerator> CredentialGeneratorPtr;
* str = cg->getServerCmdParams(":authenticator:authorizer");
*
*/
-class CredentialGenerator : public SharedBase {
+class CredentialGenerator {
public:
typedef std::map<std::string, CredentialGeneratorPtr> registeredClassMap;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
index 57cab72..73dd576 100644
--- a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
+++ b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
@@ -20,7 +20,6 @@
* limitations under the License.
*/
-#include <geode/SharedBase.hpp>
#include <geode/Properties.hpp>
#include "typedefs.hpp"
@@ -50,9 +49,10 @@ const stringList::value_type QRArr[] = {"Portfolios", "Positions"};
const char* PRiUsnm = "%s%d";
class XmlAuthzCredentialGenerator;
-typedef SharedPtr<XmlAuthzCredentialGenerator> XmlAuthzCredentialGeneratorPtr;
+typedef std::shared_ptr<XmlAuthzCredentialGenerator>
+ XmlAuthzCredentialGeneratorPtr;
-class XmlAuthzCredentialGenerator : public SharedBase {
+class XmlAuthzCredentialGenerator {
private:
ID m_id;
opCodeList* m_opCode;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/BatchObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/BatchObject.hpp b/src/tests/cpp/testobject/BatchObject.hpp
index fb65401..96e819b 100644
--- a/src/tests/cpp/testobject/BatchObject.hpp
+++ b/src/tests/cpp/testobject/BatchObject.hpp
@@ -88,7 +88,7 @@ class TESTOBJECT_EXPORT BatchObject : public TimestampedObject {
}
};
-typedef apache::geode::client::SharedPtr<BatchObject> BatchObjectPtr;
+typedef std::shared_ptr<BatchObject> BatchObjectPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_BATCHOBJECT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
index e5979d2..e08e6b3 100644
--- a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
+++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
@@ -46,8 +46,7 @@ using namespace apache::geode::client;
using namespace testframework;
namespace testobject {
class DeltaFastAssetAccount;
-typedef apache::geode::client::SharedPtr<DeltaFastAssetAccount>
- DeltaFastAssetAccountPtr;
+typedef std::shared_ptr<DeltaFastAssetAccount> DeltaFastAssetAccountPtr;
class TESTOBJECT_EXPORT DeltaFastAssetAccount : public Cacheable, public Delta {
private:
bool encodeTimestamp;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/DeltaPSTObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaPSTObject.hpp b/src/tests/cpp/testobject/DeltaPSTObject.hpp
index 1e742ee..b06cee3 100644
--- a/src/tests/cpp/testobject/DeltaPSTObject.hpp
+++ b/src/tests/cpp/testobject/DeltaPSTObject.hpp
@@ -96,7 +96,7 @@ class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, public Delta {
static Serializable* createDeserializable() { return new DeltaPSTObject(); }
};
-typedef apache::geode::client::SharedPtr<DeltaPSTObject> DeltaPSTObjectPtr;
+typedef std::shared_ptr<DeltaPSTObject> DeltaPSTObjectPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_DELTAPSTOBJECT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/DeltaTestImpl.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaTestImpl.hpp b/src/tests/cpp/testobject/DeltaTestImpl.hpp
index a8b4f29..ee4ebed 100644
--- a/src/tests/cpp/testobject/DeltaTestImpl.hpp
+++ b/src/tests/cpp/testobject/DeltaTestImpl.hpp
@@ -48,7 +48,7 @@ using namespace apache::geode::client;
namespace testobject {
class DeltaTestImpl;
-typedef SharedPtr<DeltaTestImpl> DeltaTestImplPtr;
+typedef std::shared_ptr<DeltaTestImpl> DeltaTestImplPtr;
class TESTOBJECT_EXPORT DeltaTestImpl : public Cacheable, public Delta {
private:
static uint8_t INT_MASK;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/DeltaTestObj.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaTestObj.hpp b/src/tests/cpp/testobject/DeltaTestObj.hpp
index 79f44d2..4030dff 100644
--- a/src/tests/cpp/testobject/DeltaTestObj.hpp
+++ b/src/tests/cpp/testobject/DeltaTestObj.hpp
@@ -95,7 +95,7 @@ class TESTOBJECT_EXPORT DeltaTestObj : public DeltaTestImpl {
}
};
-typedef apache::geode::client::SharedPtr<DeltaTestObj> DeltaTestObjPtr;
-}
+typedef std::shared_ptr<DeltaTestObj> DeltaTestObjPtr;
+} // namespace testobject
#endif // GEODE_TESTOBJECT_DELTATESTOBJ_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/EqStruct.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/EqStruct.hpp b/src/tests/cpp/testobject/EqStruct.hpp
index c7ef273..19cef03 100644
--- a/src/tests/cpp/testobject/EqStruct.hpp
+++ b/src/tests/cpp/testobject/EqStruct.hpp
@@ -149,7 +149,7 @@ class TESTOBJECT_EXPORT EqStruct : public TimestampedObject {
}
};
-typedef apache::geode::client::SharedPtr<EqStruct> EqStructPtr;
+typedef std::shared_ptr<EqStruct> EqStructPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_EQSTRUCT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/FastAsset.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/FastAsset.hpp b/src/tests/cpp/testobject/FastAsset.hpp
index 0b929b4..6890943 100644
--- a/src/tests/cpp/testobject/FastAsset.hpp
+++ b/src/tests/cpp/testobject/FastAsset.hpp
@@ -47,7 +47,7 @@ using namespace apache::geode::client;
using namespace testframework;
namespace testobject {
class FastAsset;
-typedef apache::geode::client::SharedPtr<FastAsset> FastAssetPtr;
+typedef std::shared_ptr<FastAsset> FastAssetPtr;
class TESTOBJECT_EXPORT FastAsset : public TimestampedObject {
private:
@@ -113,7 +113,7 @@ class TESTOBJECT_EXPORT FastAsset : public TimestampedObject {
}
};
-// typedef apache::geode::client::SharedPtr<FastAsset> FastAssetPtr;
+// typedef std::shared_ptr<FastAsset> FastAssetPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_FASTASSET_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/FastAssetAccount.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/FastAssetAccount.hpp b/src/tests/cpp/testobject/FastAssetAccount.hpp
index 1127341..2e0376c 100644
--- a/src/tests/cpp/testobject/FastAssetAccount.hpp
+++ b/src/tests/cpp/testobject/FastAssetAccount.hpp
@@ -120,7 +120,7 @@ class TESTOBJECT_EXPORT FastAssetAccount : public TimestampedObject {
}
};
-typedef apache::geode::client::SharedPtr<FastAssetAccount> FastAssetAccountPtr;
+typedef std::shared_ptr<FastAssetAccount> FastAssetAccountPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_FASTASSETACCOUNT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/InvalidPdxUsage.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/InvalidPdxUsage.hpp b/src/tests/cpp/testobject/InvalidPdxUsage.hpp
index e2b9c48..130d9ad 100644
--- a/src/tests/cpp/testobject/InvalidPdxUsage.hpp
+++ b/src/tests/cpp/testobject/InvalidPdxUsage.hpp
@@ -145,7 +145,7 @@ class TESTOBJECT_EXPORT CharTypesWithInvalidUsage : public PdxSerializable {
return new CharTypesWithInvalidUsage();
}
};
-typedef SharedPtr<CharTypesWithInvalidUsage> CharTypesWithInvalidUsagePtr;
+typedef std::shared_ptr<CharTypesWithInvalidUsage> CharTypesWithInvalidUsagePtr;
class TESTOBJECT_EXPORT AddressWithInvalidAPIUsage : public PdxSerializable {
private:
@@ -221,7 +221,8 @@ class TESTOBJECT_EXPORT AddressWithInvalidAPIUsage : public PdxSerializable {
const char* getCity() { return _city; }
};
-typedef SharedPtr<AddressWithInvalidAPIUsage> AddressWithInvalidAPIUsagePtr;
+typedef std::shared_ptr<AddressWithInvalidAPIUsage>
+ AddressWithInvalidAPIUsagePtr;
enum pdxEnumTestWithInvalidAPIUsage { mypdx1, mypdx2, mypdx3 };
@@ -686,7 +687,7 @@ class TESTOBJECT_EXPORT InvalidPdxUsage : public PdxSerializable {
bool generic2DCompare(T1** value1, T2** value2, int length,
int* arrLengths) const;
};
-typedef SharedPtr<PdxTests::InvalidPdxUsage> InvalidPdxUsagePtr;
+typedef std::shared_ptr<PdxTests::InvalidPdxUsage> InvalidPdxUsagePtr;
} // namespace PdxTests
#endif // GEODE_TESTOBJECT_INVALIDPDXUSAGE_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/NestedPdxObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NestedPdxObject.hpp b/src/tests/cpp/testobject/NestedPdxObject.hpp
index 2ab02ca..c77dd05 100644
--- a/src/tests/cpp/testobject/NestedPdxObject.hpp
+++ b/src/tests/cpp/testobject/NestedPdxObject.hpp
@@ -20,9 +20,9 @@
* limitations under the License.
*/
/*
-* NestedPdxObject.hpp
-*
-*/
+ * NestedPdxObject.hpp
+ *
+ */
#include <geode/PdxSerializable.hpp>
#include <geode/GeodeCppCache.hpp>
@@ -90,7 +90,7 @@ class TESTOBJECT_EXPORT ChildPdx : public PdxSerializable {
bool equals(ChildPdx& other) const;
};
-typedef SharedPtr<ChildPdx> ChildPdxPtr;
+typedef std::shared_ptr<ChildPdx> ChildPdxPtr;
class TESTOBJECT_EXPORT ParentPdx : public PdxSerializable {
private:
@@ -201,7 +201,7 @@ class TESTOBJECT_EXPORT ParentPdx : public PdxSerializable {
bool equals(ParentPdx& other, bool isPdxReadSerialized) const;
};
-typedef SharedPtr<ParentPdx> ParentPdxPtr;
+typedef std::shared_ptr<ParentPdx> ParentPdxPtr;
enum enumQuerytest { id1, id2, id3 };
@@ -267,7 +267,7 @@ class TESTOBJECT_EXPORT PdxEnumTestClass : public PdxSerializable {
return new PdxEnumTestClass();
}
};
-typedef SharedPtr<PdxEnumTestClass> PdxEnumTestClassPtr;
+typedef std::shared_ptr<PdxEnumTestClass> PdxEnumTestClassPtr;
class TESTOBJECT_EXPORT SerializePdx : public PdxSerializable {
private:
@@ -338,7 +338,7 @@ class TESTOBJECT_EXPORT SerializePdx : public PdxSerializable {
return true;
}
};
-typedef SharedPtr<SerializePdx> SerializePdxPtr;
+typedef std::shared_ptr<SerializePdx> SerializePdxPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_NESTEDPDXOBJECT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PSTObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PSTObject.hpp b/src/tests/cpp/testobject/PSTObject.hpp
index cdeac83..ccd74f2 100644
--- a/src/tests/cpp/testobject/PSTObject.hpp
+++ b/src/tests/cpp/testobject/PSTObject.hpp
@@ -87,7 +87,7 @@ class TESTOBJECT_EXPORT PSTObject : public TimestampedObject {
}
};
-typedef apache::geode::client::SharedPtr<PSTObject> PSTObjectPtr;
+typedef std::shared_ptr<PSTObject> PSTObjectPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_PSTOBJECT_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PdxClassV1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV1.hpp b/src/tests/cpp/testobject/PdxClassV1.hpp
index e30414b..e24a65e 100644
--- a/src/tests/cpp/testobject/PdxClassV1.hpp
+++ b/src/tests/cpp/testobject/PdxClassV1.hpp
@@ -83,7 +83,7 @@ class TESTOBJECT_EXPORT PdxType1V1 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxType1V1(); }
};
-typedef SharedPtr<PdxType1V1> PdxType1V1Ptr;
+typedef std::shared_ptr<PdxType1V1> PdxType1V1Ptr;
/************************************************************
* PdxType2V1
@@ -122,7 +122,7 @@ class TESTOBJECT_EXPORT PdxType2V1 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxType2V1(); }
};
-typedef SharedPtr<PdxType2V1> PdxType2V1Ptr;
+typedef std::shared_ptr<PdxType2V1> PdxType2V1Ptr;
/************************************************************
* PdxType3V1
@@ -166,7 +166,7 @@ class TESTOBJECT_EXPORT PdxType3V1 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxType3V1(); }
};
-typedef SharedPtr<PdxType3V1> PdxType3V1Ptr;
+typedef std::shared_ptr<PdxType3V1> PdxType3V1Ptr;
/************************************************************
* PdxTypesV1R1
@@ -205,7 +205,7 @@ class TESTOBJECT_EXPORT PdxTypesV1R1 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypesV1R1(); }
};
-typedef SharedPtr<PdxTypesV1R1> PdxTypesV1R1Ptr;
+typedef std::shared_ptr<PdxTypesV1R1> PdxTypesV1R1Ptr;
/************************************************************
* PdxTypesV1R2
@@ -244,7 +244,7 @@ class TESTOBJECT_EXPORT PdxTypesV1R2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypesV1R2(); }
};
-typedef SharedPtr<PdxTypesV1R2> PdxTypesV1R2Ptr;
+typedef std::shared_ptr<PdxTypesV1R2> PdxTypesV1R2Ptr;
/************************************************************
* PdxTypesIgnoreUnreadFieldsV1
@@ -287,7 +287,8 @@ class TESTOBJECT_EXPORT PdxTypesIgnoreUnreadFieldsV1 : public PdxSerializable {
return new PdxTypesIgnoreUnreadFieldsV1();
}
};
-typedef SharedPtr<PdxTypesIgnoreUnreadFieldsV1> PdxTypesIgnoreUnreadFieldsV1Ptr;
+typedef std::shared_ptr<PdxTypesIgnoreUnreadFieldsV1>
+ PdxTypesIgnoreUnreadFieldsV1Ptr;
/************************************************************
* PdxVersionedV1
@@ -348,7 +349,7 @@ class TESTOBJECT_EXPORT PdxVersionedV1 : public PdxSerializable {
return new PdxVersionedV1();
}
};
-typedef SharedPtr<PdxVersionedV1> PdxVersionedV1Ptr;
+typedef std::shared_ptr<PdxVersionedV1> PdxVersionedV1Ptr;
/************************************************************
* TestKey
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PdxClassV2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV2.hpp b/src/tests/cpp/testobject/PdxClassV2.hpp
index 81b303b..3760ead 100644
--- a/src/tests/cpp/testobject/PdxClassV2.hpp
+++ b/src/tests/cpp/testobject/PdxClassV2.hpp
@@ -86,7 +86,7 @@ class TESTOBJECT_EXPORT PdxTypes1V2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypes1V2(); }
};
-typedef SharedPtr<PdxTypes1V2> PdxTypes1V2Ptr;
+typedef std::shared_ptr<PdxTypes1V2> PdxTypes1V2Ptr;
/************************************************************
* PdxTypes2V2
@@ -129,7 +129,7 @@ class TESTOBJECT_EXPORT PdxTypes2V2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypes2V2(); }
};
-typedef SharedPtr<PdxTypes2V2> PdxTypes2V2Ptr;
+typedef std::shared_ptr<PdxTypes2V2> PdxTypes2V2Ptr;
/************************************************************
* PdxTypes3V2
@@ -173,7 +173,7 @@ class TESTOBJECT_EXPORT PdxTypes3V2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypes3V2(); }
};
-typedef SharedPtr<PdxTypes3V2> PdxTypes3V2Ptr;
+typedef std::shared_ptr<PdxTypes3V2> PdxTypes3V2Ptr;
/************************************************************
* PdxTypesR1V2
@@ -218,7 +218,7 @@ class TESTOBJECT_EXPORT PdxTypesR1V2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypesR1V2(); }
};
-typedef SharedPtr<PdxTypesR1V2> PdxTypesR1V2Ptr;
+typedef std::shared_ptr<PdxTypesR1V2> PdxTypesR1V2Ptr;
/************************************************************
* PdxTypesR2V2
@@ -263,7 +263,7 @@ class TESTOBJECT_EXPORT PdxTypesR2V2 : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new PdxTypesR2V2(); }
};
-typedef SharedPtr<PdxTypesR2V2> PdxTypesR2V2Ptr;
+typedef std::shared_ptr<PdxTypesR2V2> PdxTypesR2V2Ptr;
/************************************************************
* PdxTypesIgnoreUnreadFieldsV2
@@ -312,7 +312,8 @@ class TESTOBJECT_EXPORT PdxTypesIgnoreUnreadFieldsV2 : public PdxSerializable {
return new PdxTypesIgnoreUnreadFieldsV2();
}
};
-typedef SharedPtr<PdxTypesIgnoreUnreadFieldsV2> PdxTypesIgnoreUnreadFieldsV2Ptr;
+typedef std::shared_ptr<PdxTypesIgnoreUnreadFieldsV2>
+ PdxTypesIgnoreUnreadFieldsV2Ptr;
/************************************************************
* PdxVersionedV2
@@ -374,7 +375,7 @@ class TESTOBJECT_EXPORT PdxVersionedV2 : public PdxSerializable {
return new PdxVersionedV2();
}
};
-typedef SharedPtr<PdxVersionedV2> PdxVersionedV2Ptr;
+typedef std::shared_ptr<PdxVersionedV2> PdxVersionedV2Ptr;
/************************************************************
* TestKey
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxType.hpp b/src/tests/cpp/testobject/PdxType.hpp
index ae24060..59963ec 100644
--- a/src/tests/cpp/testobject/PdxType.hpp
+++ b/src/tests/cpp/testobject/PdxType.hpp
@@ -80,7 +80,7 @@ class TESTOBJECT_EXPORT Parent : public GrandParent {
};
class Child;
-typedef SharedPtr<Child> ChildPtr;
+typedef std::shared_ptr<Child> ChildPtr;
class TESTOBJECT_EXPORT Child : public Parent, public PdxSerializable {
private:
@@ -242,7 +242,7 @@ class TESTOBJECT_EXPORT CharTypes : public PdxSerializable {
static PdxSerializable* createDeserializable() { return new CharTypes(); }
};
-typedef SharedPtr<CharTypes> CharTypesPtr;
+typedef std::shared_ptr<CharTypes> CharTypesPtr;
/**********/
class TESTOBJECT_EXPORT Address : public PdxSerializable {
@@ -322,7 +322,7 @@ class TESTOBJECT_EXPORT Address : public PdxSerializable {
return str;
}*/
};
-typedef SharedPtr<Address> AddressPtr;
+typedef std::shared_ptr<Address> AddressPtr;
enum pdxEnumTest { pdx1, pdx2, pdx3 };
class TESTOBJECT_EXPORT PdxType : public PdxSerializable {
private:
@@ -797,7 +797,7 @@ class TESTOBJECT_EXPORT PdxType : public PdxSerializable {
bool generic2DCompare(T1** value1, T2** value2, int length,
int* arrLengths) const;
};
-typedef SharedPtr<PdxTests::PdxType> PdxTypePtr;
+typedef std::shared_ptr<PdxTests::PdxType> PdxTypePtr;
} // namespace PdxTests
#endif // GEODE_TESTOBJECT_PDXTYPE_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PdxVersioned1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxVersioned1.hpp b/src/tests/cpp/testobject/PdxVersioned1.hpp
index cbbb3b6..d16653a 100644
--- a/src/tests/cpp/testobject/PdxVersioned1.hpp
+++ b/src/tests/cpp/testobject/PdxVersioned1.hpp
@@ -254,7 +254,7 @@ class TESTOBJECT_EXPORT PdxVersioned1 : public PdxSerializable {
bool generic2DCompare(T1** value1, T2** value2, int length,
int* arrLengths) const;
};
-typedef SharedPtr<PdxTests::PdxVersioned1> PdxVersioned1Ptr;
+typedef std::shared_ptr<PdxTests::PdxVersioned1> PdxVersioned1Ptr;
} // namespace PdxTests
#endif // GEODE_TESTOBJECT_PDXVERSIONED1_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PdxVersioned2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxVersioned2.hpp b/src/tests/cpp/testobject/PdxVersioned2.hpp
index f53cd52..18843d7 100644
--- a/src/tests/cpp/testobject/PdxVersioned2.hpp
+++ b/src/tests/cpp/testobject/PdxVersioned2.hpp
@@ -257,7 +257,7 @@ class TESTOBJECT_EXPORT PdxVersioned2 : public PdxSerializable {
bool generic2DCompare(T1** value1, T2** value2, int length,
int* arrLengths) const;
};
-typedef SharedPtr<PdxTests::PdxVersioned2> PdxVersioned2Ptr;
+typedef std::shared_ptr<PdxTests::PdxVersioned2> PdxVersioned2Ptr;
} // namespace PdxTests
#endif // GEODE_TESTOBJECT_PDXVERSIONED2_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/Portfolio.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/Portfolio.hpp b/src/tests/cpp/testobject/Portfolio.hpp
index 92cdaba..d147cfb 100644
--- a/src/tests/cpp/testobject/Portfolio.hpp
+++ b/src/tests/cpp/testobject/Portfolio.hpp
@@ -128,7 +128,7 @@ class TESTOBJECT_EXPORT Portfolio : public Serializable {
CacheableStringPtr toString() const;
};
-typedef SharedPtr<Portfolio> PortfolioPtr;
+typedef std::shared_ptr<Portfolio> PortfolioPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_PORTFOLIO_H_
http://git-wip-us.apache.org/repos/asf/geode-native/blob/b1a9af53/src/tests/cpp/testobject/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PortfolioPdx.hpp b/src/tests/cpp/testobject/PortfolioPdx.hpp
index a4cc600..75d1483 100644
--- a/src/tests/cpp/testobject/PortfolioPdx.hpp
+++ b/src/tests/cpp/testobject/PortfolioPdx.hpp
@@ -105,7 +105,7 @@ class TESTOBJECT_EXPORT PortfolioPdx : public PdxSerializable {
CacheableStringPtr toString() const;
};
-typedef SharedPtr<PortfolioPdx> PortfolioPdxPtr;
+typedef std::shared_ptr<PortfolioPdx> PortfolioPdxPtr;
} // namespace testobject
#endif // GEODE_TESTOBJECT_PORTFOLIOPDX_H_