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/05/17 17:50:11 UTC
[29/46] geode-native git commit: GEODE-2741: Remove custom shared
pointer from cppcache
GEODE-2741: Remove custom shared pointer from cppcache
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/c0098121
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/c0098121
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/c0098121
Branch: refs/heads/develop
Commit: c0098121eb9b8ee7d537ac0d0bb767ebb6d46927
Parents: e2630b1
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Tue Mar 28 17:34:29 2017 -0700
Committer: David Kimura <dk...@pivotal.io>
Committed: Mon May 15 11:40:55 2017 -0700
----------------------------------------------------------------------
packer/solaris/install-build-tools.sh | 17 +-
packer/solaris/install-opencsw.sh | 11 +-
packer/solaris/install-solarisstudio.sh | 11 +-
packer/solaris/install-test-tools.sh | 8 +-
src/clicache/src/AttributesFactory.cpp | 14 +-
src/clicache/src/AttributesMutator.cpp | 6 +-
src/clicache/src/Cache.cpp | 6 +-
src/clicache/src/CacheFactory.cpp | 4 +-
src/clicache/src/CacheTransactionManager.cpp | 10 +-
src/clicache/src/CacheableBuiltins.hpp | 4 +-
src/clicache/src/CacheableHashSet.hpp | 6 +-
src/clicache/src/CacheableObjectArray.cpp | 2 +-
src/clicache/src/CqAttributesFactory.cpp | 26 +-
src/clicache/src/CqAttributesMutator.cpp | 28 +-
src/clicache/src/CqQuery.cpp | 10 +-
src/clicache/src/DistributedSystem.cpp | 8 +-
src/clicache/src/ExceptionTypes.cpp | 2 +-
src/clicache/src/ExceptionTypes.hpp | 2 +-
src/clicache/src/Execution.cpp | 10 +-
src/clicache/src/LocalRegion.cpp | 24 +-
src/clicache/src/Pool.cpp | 4 +-
src/clicache/src/PoolFactory.cpp | 2 +-
src/clicache/src/PoolManager.cpp | 12 +-
src/clicache/src/Properties.cpp | 4 +-
src/clicache/src/QueryService.cpp | 14 +-
src/clicache/src/Region.cpp | 70 +-
src/clicache/src/RegionAttributes.cpp | 2 +-
src/clicache/src/RegionFactory.cpp | 12 +-
src/clicache/src/ResultCollector.cpp | 2 +-
src/clicache/src/ResultSet.cpp | 2 +-
src/clicache/src/Serializable.cpp | 96 +--
src/clicache/src/Serializable.hpp | 2 +-
src/clicache/src/Struct.cpp | 8 +-
src/clicache/src/StructSet.cpp | 2 +-
src/clicache/src/impl/CacheLoader.hpp | 4 +-
src/clicache/src/impl/ManagedAuthInitialize.cpp | 4 +-
src/clicache/src/impl/ManagedCacheListener.cpp | 4 +-
src/clicache/src/impl/ManagedCacheLoader.cpp | 4 +-
src/clicache/src/impl/ManagedCacheWriter.cpp | 2 +-
src/clicache/src/impl/ManagedCacheableDelta.cpp | 4 +-
.../src/impl/ManagedCacheableDeltaBytes.cpp | 6 +-
src/clicache/src/impl/ManagedCacheableKey.cpp | 4 +-
.../src/impl/ManagedCacheableKeyBytes.cpp | 6 +-
.../src/impl/ManagedCqStatusListener.hpp | 2 +-
.../src/impl/ManagedFixedPartitionResolver.cpp | 2 +-
.../src/impl/ManagedPartitionResolver.cpp | 2 +-
.../src/impl/ManagedResultCollector.cpp | 4 +-
.../src/impl/ManagedTransactionListener.cpp | 6 +-
.../src/impl/ManagedTransactionWriter.cpp | 2 +-
src/clicache/src/impl/ManagedVisitor.cpp | 4 +-
src/clicache/src/impl/PdxHelper.cpp | 4 +-
src/clicache/src/impl/PdxInstanceImpl.cpp | 4 +-
.../src/impl/PdxManagedCacheableKey.cpp | 6 +-
.../src/impl/PdxManagedCacheableKeyBytes.cpp | 8 +-
.../src/impl/PersistenceManagerProxy.hpp | 4 +-
src/clicache/src/impl/SafeConvert.hpp | 2 +-
.../include/geode/AttributesFactory.hpp | 22 +-
src/cppcache/include/geode/Cache.hpp | 14 +-
src/cppcache/include/geode/CacheFactory.hpp | 16 +-
src/cppcache/include/geode/CacheListener.hpp | 4 +-
src/cppcache/include/geode/CacheLoader.hpp | 6 +-
src/cppcache/include/geode/CacheWriter.hpp | 2 +-
src/cppcache/include/geode/Cacheable.inl | 2 +-
.../include/geode/CacheableBuiltins.hpp | 104 +--
src/cppcache/include/geode/CacheableDate.hpp | 16 +-
src/cppcache/include/geode/CacheableEnum.hpp | 5 +-
.../include/geode/CacheableFileName.hpp | 10 +-
src/cppcache/include/geode/CacheableKey.hpp | 2 +
.../include/geode/CacheableObjectArray.hpp | 6 +-
src/cppcache/include/geode/CacheableString.hpp | 54 +-
.../include/geode/CacheableUndefined.hpp | 4 +-
src/cppcache/include/geode/CqAttributes.hpp | 8 +-
.../include/geode/CqAttributesFactory.hpp | 8 +-
.../include/geode/CqAttributesMutator.hpp | 9 +-
src/cppcache/include/geode/CqEvent.hpp | 4 +-
src/cppcache/include/geode/CqListener.hpp | 2 +-
src/cppcache/include/geode/DataInput.hpp | 16 +-
src/cppcache/include/geode/DataOutput.hpp | 2 +-
.../include/geode/DistributedSystem.hpp | 2 +-
src/cppcache/include/geode/EntryEvent.hpp | 4 +-
src/cppcache/include/geode/Exception.hpp | 2 +-
src/cppcache/include/geode/ExceptionTypes.hpp | 2 +-
src/cppcache/include/geode/Execution.hpp | 6 +-
src/cppcache/include/geode/FunctionService.hpp | 10 +-
src/cppcache/include/geode/HashFunction.hpp | 2 +-
.../include/geode/HashMapOfSharedBase.hpp | 2 +-
src/cppcache/include/geode/HashMapT.hpp | 18 +-
.../include/geode/HashSetOfSharedBase.hpp | 2 +-
src/cppcache/include/geode/HashSetT.hpp | 8 +-
.../include/geode/PdxInstanceFactory.hpp | 2 +-
src/cppcache/include/geode/PdxWrapper.hpp | 5 +-
src/cppcache/include/geode/Pool.hpp | 3 +-
src/cppcache/include/geode/PoolManager.hpp | 6 +-
src/cppcache/include/geode/Properties.hpp | 10 +-
src/cppcache/include/geode/QueryService.hpp | 10 +-
src/cppcache/include/geode/Region.hpp | 185 ++---
src/cppcache/include/geode/RegionAttributes.hpp | 12 +-
src/cppcache/include/geode/RegionEntry.hpp | 8 +-
src/cppcache/include/geode/RegionFactory.hpp | 19 +-
src/cppcache/include/geode/RegionService.hpp | 2 +-
.../include/geode/SelectResultsIterator.hpp | 2 +-
src/cppcache/include/geode/Serializable.hpp | 4 +-
src/cppcache/include/geode/Serializer.hpp | 6 +-
src/cppcache/include/geode/SharedBase.hpp | 43 +-
src/cppcache/include/geode/SharedPtr.hpp | 261 +------
src/cppcache/include/geode/SharedPtrHelper.hpp | 15 +-
src/cppcache/include/geode/Struct.hpp | 4 +-
src/cppcache/include/geode/SystemProperties.hpp | 16 +-
src/cppcache/include/geode/TypeHelper.hpp | 13 +-
.../include/geode/VectorOfSharedBase.hpp | 4 +-
src/cppcache/include/geode/VectorT.hpp | 42 +-
src/cppcache/include/geode/geode_base.hpp | 28 +-
.../BuiltinCacheableWrappers.hpp | 131 ++--
src/cppcache/integration-test/CMakeLists.txt | 1 -
src/cppcache/integration-test/CacheHelper.cpp | 60 +-
src/cppcache/integration-test/CacheHelper.hpp | 26 +-
.../integration-test/CacheImplHelper.hpp | 6 +-
src/cppcache/integration-test/DeltaEx.hpp | 15 +-
src/cppcache/integration-test/QueryHelper.hpp | 33 +-
src/cppcache/integration-test/TallyListener.hpp | 12 +-
src/cppcache/integration-test/TallyWriter.hpp | 8 +-
src/cppcache/integration-test/ThinClientCQ.hpp | 4 +-
.../integration-test/ThinClientCallbackArg.hpp | 4 +-
.../integration-test/ThinClientDistOps.hpp | 73 +-
.../integration-test/ThinClientDistOps2.hpp | 56 +-
.../integration-test/ThinClientDurable.hpp | 70 +-
.../ThinClientDurableFailover.hpp | 30 +-
.../ThinClientDurableInterest.hpp | 28 +-
.../ThinClientDurableReconnect.hpp | 8 +-
.../integration-test/ThinClientFailover.hpp | 26 +-
.../integration-test/ThinClientFailover2.hpp | 36 +-
.../integration-test/ThinClientFailover3.hpp | 20 +-
.../ThinClientFailoverInterest.hpp | 28 +-
.../ThinClientFailoverInterest2.hpp | 24 +-
.../ThinClientFailoverInterestAllWithCache.hpp | 42 +-
.../ThinClientFailoverRegex.hpp | 34 +-
.../integration-test/ThinClientGatewayTest.hpp | 4 +-
.../integration-test/ThinClientHeapLRU.hpp | 12 +-
.../integration-test/ThinClientHelper.hpp | 78 +--
.../integration-test/ThinClientInterest1.hpp | 2 +-
.../integration-test/ThinClientInterest3.hpp | 6 +-
.../ThinClientInterest3Cacheless.hpp | 8 +-
.../integration-test/ThinClientInterestList.hpp | 26 +-
.../ThinClientInterestList2.hpp | 20 +-
.../integration-test/ThinClientListenerInit.hpp | 16 +-
.../ThinClientListenerWriter.hpp | 30 +-
.../ThinClientLocalCacheLoader.hpp | 24 +-
.../integration-test/ThinClientNotification.hpp | 34 +-
.../ThinClientPdxSerializer.hpp | 121 ++--
.../ThinClientPdxSerializers.hpp | 17 +-
.../integration-test/ThinClientPutAll.hpp | 105 +--
.../ThinClientPutAllWithCallBack.hpp | 101 +--
.../integration-test/ThinClientPutGetAll.hpp | 129 ++--
.../ThinClientRIwithlocalRegionDestroy.hpp | 10 +-
.../integration-test/ThinClientRegex.hpp | 20 +-
.../integration-test/ThinClientRegex2.hpp | 24 +-
.../integration-test/ThinClientRegex3.hpp | 26 +-
.../integration-test/ThinClientRemoveAll.hpp | 32 +-
src/cppcache/integration-test/ThinClientSSL.hpp | 34 +-
.../ThinClientSSLWithPassword.hpp | 36 +-
.../integration-test/ThinClientSecurity.hpp | 6 +-
.../ThinClientSecurityHelper.hpp | 12 +-
.../integration-test/ThinClientTXFailover.hpp | 26 +-
.../integration-test/ThinClientTransactions.hpp | 56 +-
.../ThinClientTransactionsXA.hpp | 88 +--
.../integration-test/ThinClientVersionedOps.hpp | 100 +--
src/cppcache/integration-test/fw_dunit.cpp | 2 -
src/cppcache/integration-test/fw_dunit.hpp | 2 -
.../integration-test/testAttributesFactory.cpp | 48 +-
.../integration-test/testAttributesMutator.cpp | 11 +-
src/cppcache/integration-test/testCache.cpp | 18 +-
src/cppcache/integration-test/testCacheless.cpp | 20 +-
.../integration-test/testEntriesMap.cpp | 96 +--
.../testEntriesMapForVersioning.cpp | 556 +++++++--------
.../integration-test/testExpiration.cpp | 48 +-
src/cppcache/integration-test/testLRUList.cpp | 22 +-
.../testOverflowPutGetSqLite.cpp | 84 ++-
.../testRegionAccessThreadSafe.cpp | 6 +-
src/cppcache/integration-test/testRegionMap.cpp | 8 +-
.../integration-test/testRegionTemplateArgs.cpp | 244 +++----
.../integration-test/testSerialization.cpp | 13 +-
src/cppcache/integration-test/testSharedPtr.cpp | 108 ---
.../integration-test/testSystemProperties.cpp | 8 +-
.../testThinClientAfterRegionLive.cpp | 12 +-
.../integration-test/testThinClientBigValue.cpp | 69 +-
.../testThinClientCacheableStringArray.cpp | 12 +-
.../testThinClientCacheables.cpp | 26 +-
.../testThinClientCacheablesLimits.cpp | 26 +-
.../testThinClientClearRegion.cpp | 12 +-
.../testThinClientConflation.cpp | 21 +-
.../testThinClientContainsKeyOnServer.cpp | 4 +-
.../integration-test/testThinClientCq.cpp | 90 +--
.../integration-test/testThinClientCqDelta.cpp | 14 +-
.../testThinClientCqDurable.cpp | 56 +-
.../testThinClientCqFailover.cpp | 58 +-
.../testThinClientCqHAFailover.cpp | 48 +-
.../integration-test/testThinClientCqIR.cpp | 103 ++-
.../testThinClientDeltaWithNotification.cpp | 8 +-
.../testThinClientDisconnectionListioner.cpp | 2 +-
.../testThinClientExecuteFunctionPrSHOP.cpp | 79 ++-
.../testThinClientFixedPartitionResolver.cpp | 19 +-
.../testThinClientGetInterests.cpp | 8 +-
.../testThinClientHADistOps.cpp | 33 +-
.../testThinClientHAEventIDMap.cpp | 32 +-
.../testThinClientHAFailover.cpp | 22 +-
.../testThinClientHAFailoverRegex.cpp | 22 +-
.../testThinClientHAMixedRedundancy.cpp | 22 +-
.../testThinClientHAPeriodicAck.cpp | 32 +-
.../testThinClientHAQueryFailover.cpp | 14 +-
.../integration-test/testThinClientHeapLRU.cpp | 6 +-
.../testThinClientIntResPolKeysInv.cpp | 24 +-
.../testThinClientInterest1Cacheless.cpp | 15 +-
.../testThinClientInterest1_Bug1001.cpp | 30 +-
.../testThinClientInterestNotify.cpp | 35 +-
.../testThinClientLRUExpiration.cpp | 36 +-
.../testThinClientListenerCallbackArgTest.cpp | 30 +-
.../testThinClientListenerEvents.cpp | 4 +-
.../integration-test/testThinClientLocator.cpp | 4 +-
.../testThinClientLocatorFailover.cpp | 21 +-
.../integration-test/testThinClientMultiDS.cpp | 20 +-
...nClientNotificationWithDeltaWithoutcache.cpp | 6 +-
.../testThinClientPRPutAllFailover.cpp | 13 +-
.../testThinClientPRSingleHop.cpp | 56 +-
.../testThinClientPRSingleHopServerGroup.cpp | 39 +-
.../testThinClientPartitionResolver.cpp | 3 +-
.../testThinClientPdxDeltaWithNotification.cpp | 8 +-
.../integration-test/testThinClientPdxEnum.cpp | 16 +-
.../testThinClientPdxInstance.cpp | 430 ++++++------
.../integration-test/testThinClientPdxTests.cpp | 480 ++++++-------
.../testThinClientPoolExecuteFunction.cpp | 695 ++++++++-----------
...ExecuteFunctionDisableChunkHandlerThread.cpp | 10 +-
.../testThinClientPoolExecuteFunctionPrSHOP.cpp | 687 ++++++++----------
...ClientPoolExecuteFunctionThrowsException.cpp | 310 ++++-----
.../testThinClientPoolExecuteHAFunction.cpp | 136 ++--
...estThinClientPoolExecuteHAFunctionPrSHOP.cpp | 114 +--
.../testThinClientPoolLocator.cpp | 21 +-
.../testThinClientPoolRedundancy.cpp | 29 +-
.../testThinClientPutAllPRSingleHop.cpp | 22 +-
.../testThinClientPutWithDelta.cpp | 27 +-
...nClientRegionQueryDifferentServerConfigs.cpp | 8 +-
.../testThinClientRegionQueryExclusiveness.cpp | 14 +-
.../testThinClientRemoteQueryFailover.cpp | 10 +-
.../testThinClientRemoteQueryFailoverPdx.cpp | 10 +-
.../testThinClientRemoteQueryRS.cpp | 74 +-
.../testThinClientRemoteQuerySS.cpp | 166 ++---
.../testThinClientRemoteQueryTimeout.cpp | 16 +-
.../testThinClientRemoteRegionQuery.cpp | 17 +-
.../testThinClientRemoveOps.cpp | 141 ++--
.../testThinClientSSLAuthCorrupt.cpp | 14 +-
.../testThinClientSSLAuthFail.cpp | 6 +-
.../testThinClientSSLAuthUntrusted.cpp | 14 +-
.../testThinClientSSLWithSecurityAuthz.cpp | 60 +-
.../testThinClientSecurityAuthentication.cpp | 30 +-
.../testThinClientSecurityAuthenticationMU.cpp | 59 +-
.../testThinClientSecurityAuthorization.cpp | 64 +-
.../testThinClientSecurityAuthorizationMU.cpp | 122 ++--
.../testThinClientSecurityCQAuthorization.cpp | 44 +-
.../testThinClientSecurityCQAuthorizationMU.cpp | 38 +-
.../testThinClientSecurityDH.cpp | 12 +-
.../testThinClientSecurityDH_MU.cpp | 19 +-
...inClientSecurityDurableCQAuthorizationMU.cpp | 52 +-
.../testThinClientSecurityMultiUserTest.cpp | 4 +-
.../testThinClientSecurityPostAuthorization.cpp | 29 +-
.../testThinClientStatistics.cpp | 12 +-
.../testThinClientTicket303.cpp | 2 +-
.../testThinClientTicket317.cpp | 6 +-
.../integration-test/testThinClientTracking.cpp | 6 +-
.../testThinClientWriterException.cpp | 8 +-
src/cppcache/integration-test/testUtils.hpp | 30 +-
.../testXmlCacheCreationWithOverFlow.cpp | 35 +-
.../testXmlCacheCreationWithPools.cpp | 26 +-
src/cppcache/src/AdminRegion.cpp | 35 +-
src/cppcache/src/AdminRegion.hpp | 18 +-
src/cppcache/src/AttributesFactory.cpp | 29 +-
src/cppcache/src/AttributesMutator.cpp | 32 +-
src/cppcache/src/BucketServerLocation.hpp | 10 +-
src/cppcache/src/Cache.cpp | 25 +-
src/cppcache/src/CacheConfig.cpp | 2 +-
src/cppcache/src/CacheFactory.cpp | 174 ++---
src/cppcache/src/CacheImpl.cpp | 156 ++---
src/cppcache/src/CacheImpl.hpp | 12 +-
src/cppcache/src/CacheRegionHelper.hpp | 2 +-
.../src/CacheTransactionManagerImpl.cpp | 54 +-
.../src/CacheTransactionManagerImpl.hpp | 4 +-
src/cppcache/src/CacheXmlParser.cpp | 12 +-
src/cppcache/src/CacheableEnum.cpp | 18 +-
src/cppcache/src/CacheableObjectPartList.cpp | 13 +-
src/cppcache/src/CacheableObjectPartList.hpp | 6 +-
src/cppcache/src/CacheableToken.cpp | 45 +-
src/cppcache/src/CacheableToken.hpp | 35 +-
src/cppcache/src/CachedDeserializableHelper.hpp | 2 +-
src/cppcache/src/ClientMetadata.cpp | 26 +-
src/cppcache/src/ClientMetadataService.cpp | 147 ++--
src/cppcache/src/ClientMetadataService.hpp | 4 +-
src/cppcache/src/ClientProxyMembershipID.cpp | 29 +-
src/cppcache/src/ClientProxyMembershipID.hpp | 17 +-
src/cppcache/src/ConcurrentEntriesMap.cpp | 2 +-
src/cppcache/src/ConcurrentEntriesMap.hpp | 3 +-
src/cppcache/src/CppCacheLibrary.cpp | 26 +-
src/cppcache/src/CqAttributesFactory.cpp | 38 +-
src/cppcache/src/CqAttributesImpl.cpp | 39 +-
src/cppcache/src/CqAttributesImpl.hpp | 16 +-
src/cppcache/src/CqAttributesMutatorImpl.cpp | 22 +-
src/cppcache/src/CqAttributesMutatorImpl.hpp | 2 +-
src/cppcache/src/CqEventImpl.cpp | 4 +-
src/cppcache/src/CqQueryImpl.cpp | 64 +-
src/cppcache/src/CqQueryImpl.hpp | 17 +-
src/cppcache/src/CqService.cpp | 157 ++---
src/cppcache/src/CqService.hpp | 38 +-
src/cppcache/src/DSMemberForVersionStamp.hpp | 2 +-
src/cppcache/src/Delta.cpp | 2 +-
src/cppcache/src/DiffieHellman.cpp | 4 +-
src/cppcache/src/DiskStoreId.hpp | 23 +-
src/cppcache/src/DistributedSystem.cpp | 12 +-
src/cppcache/src/DistributedSystemImpl.cpp | 2 +-
src/cppcache/src/EntriesMap.hpp | 4 +-
src/cppcache/src/EntriesMapFactory.hpp | 2 +-
src/cppcache/src/EntryExpiryHandler.cpp | 8 +-
src/cppcache/src/EnumInfo.cpp | 14 +-
src/cppcache/src/EventIdMap.cpp | 10 +-
src/cppcache/src/EvictionController.cpp | 4 +-
src/cppcache/src/Exception.cpp | 10 +-
src/cppcache/src/ExceptionTypes.cpp | 4 +-
src/cppcache/src/ExecutionImpl.cpp | 97 ++-
src/cppcache/src/ExecutionImpl.hpp | 24 +-
src/cppcache/src/FarSideEntryOp.cpp | 8 +-
.../src/FixedPartitionAttributesImpl.hpp | 8 +-
src/cppcache/src/FunctionService.cpp | 47 +-
src/cppcache/src/FunctionServiceImpl.cpp | 3 +-
src/cppcache/src/FunctionServiceImpl.hpp | 2 +
.../src/GatewayEventCallbackArgument.hpp | 2 +-
.../src/GatewaySenderEventCallbackArgument.hpp | 2 +-
src/cppcache/src/GetAllServersResponse.cpp | 6 +-
.../InternalCacheTransactionManager2PCImpl.cpp | 4 +-
src/cppcache/src/LRUAction.cpp | 4 +-
src/cppcache/src/LRUAction.hpp | 2 +-
src/cppcache/src/LRUEntriesMap.cpp | 42 +-
src/cppcache/src/LRUEntriesMap.hpp | 2 +-
src/cppcache/src/LRUList.cpp | 6 +-
src/cppcache/src/LRULocalDestroyAction.cpp | 2 +-
src/cppcache/src/LocalRegion.cpp | 301 ++++----
src/cppcache/src/LocalRegion.hpp | 73 +-
src/cppcache/src/MapEntry.cpp | 2 +-
src/cppcache/src/MapEntry.hpp | 13 +-
src/cppcache/src/MapEntryT.hpp | 20 +-
src/cppcache/src/MapSegment.cpp | 101 +--
src/cppcache/src/MapSegment.hpp | 18 +-
src/cppcache/src/MapWithLock.hpp | 2 +-
src/cppcache/src/MemberListForVersionStamp.cpp | 2 +-
src/cppcache/src/MemberListForVersionStamp.hpp | 2 +-
src/cppcache/src/PdxEnumInstantiator.cpp | 2 +-
src/cppcache/src/PdxFieldType.cpp | 4 +-
src/cppcache/src/PdxHelper.cpp | 255 ++-----
src/cppcache/src/PdxHelper.hpp | 5 +-
src/cppcache/src/PdxInstanceFactoryImpl.cpp | 63 +-
src/cppcache/src/PdxInstanceFactoryImpl.hpp | 6 +-
src/cppcache/src/PdxInstanceImpl.cpp | 395 +++++------
src/cppcache/src/PdxInstanceImpl.hpp | 2 +-
src/cppcache/src/PdxInstantiator.cpp | 2 +-
src/cppcache/src/PdxLocalReader.cpp | 18 +-
src/cppcache/src/PdxLocalWriter.cpp | 107 +--
src/cppcache/src/PdxLocalWriter.hpp | 3 +-
src/cppcache/src/PdxReaderWithTypeCollector.cpp | 12 +-
src/cppcache/src/PdxRemotePreservedData.hpp | 6 +-
src/cppcache/src/PdxRemoteReader.cpp | 12 +-
src/cppcache/src/PdxRemoteWriter.cpp | 68 +-
src/cppcache/src/PdxType.cpp | 74 +-
src/cppcache/src/PdxType.hpp | 6 +-
src/cppcache/src/PdxTypeRegistry.cpp | 46 +-
src/cppcache/src/PdxWrapper.cpp | 4 +-
src/cppcache/src/PdxWriterWithTypeCollector.cpp | 60 +-
src/cppcache/src/Pool.cpp | 18 +-
src/cppcache/src/PoolAttributes.cpp | 3 +-
src/cppcache/src/PoolFactory.cpp | 16 +-
src/cppcache/src/PoolManager.cpp | 9 +-
src/cppcache/src/Properties.cpp | 22 +-
src/cppcache/src/ProxyCache.cpp | 38 +-
src/cppcache/src/ProxyCache.hpp | 6 +-
src/cppcache/src/ProxyRegion.hpp | 204 +++---
src/cppcache/src/ProxyRemoteQueryService.cpp | 85 ++-
src/cppcache/src/ProxyRemoteQueryService.hpp | 6 +-
src/cppcache/src/PutAllPartialResult.cpp | 2 +-
src/cppcache/src/PutAllPartialResult.hpp | 8 +-
.../src/PutAllPartialResultServerException.cpp | 2 +-
src/cppcache/src/RegionAttributes.cpp | 62 +-
src/cppcache/src/RegionCommit.cpp | 25 +-
src/cppcache/src/RegionCommit.hpp | 4 +-
src/cppcache/src/RegionEntry.cpp | 6 +-
src/cppcache/src/RegionExpiryHandler.cpp | 8 +-
src/cppcache/src/RegionFactory.cpp | 81 +--
src/cppcache/src/RegionInternal.cpp | 40 +-
src/cppcache/src/RegionInternal.hpp | 8 +-
src/cppcache/src/RegionXmlCreation.cpp | 10 +-
src/cppcache/src/RemoteQuery.cpp | 14 +-
src/cppcache/src/RemoteQuery.hpp | 4 +-
src/cppcache/src/RemoteQueryService.cpp | 44 +-
src/cppcache/src/RemoteQueryService.hpp | 12 +-
src/cppcache/src/ResultSetImpl.cpp | 2 +-
src/cppcache/src/ResultSetImpl.hpp | 4 +-
src/cppcache/src/SelectResultsIterator.cpp | 4 +-
src/cppcache/src/SerializationRegistry.cpp | 43 +-
src/cppcache/src/SerializationRegistry.hpp | 2 +-
src/cppcache/src/ServerLocation.cpp | 2 +-
src/cppcache/src/ServerLocation.hpp | 12 +-
src/cppcache/src/SharedBase.cpp | 39 --
src/cppcache/src/Struct.cpp | 2 +-
src/cppcache/src/StructSetImpl.cpp | 4 +-
src/cppcache/src/StructSetImpl.hpp | 4 +-
src/cppcache/src/SystemProperties.cpp | 28 +-
src/cppcache/src/TXCleaner.cpp | 2 +-
src/cppcache/src/TXCommitMessage.cpp | 6 +-
src/cppcache/src/TXState.cpp | 6 +-
src/cppcache/src/TcrChunkedContext.hpp | 6 +-
src/cppcache/src/TcrConnection.cpp | 46 +-
src/cppcache/src/TcrConnectionManager.cpp | 4 +-
src/cppcache/src/TcrEndpoint.cpp | 18 +-
src/cppcache/src/TcrMessage.cpp | 191 +++--
src/cppcache/src/TcrMessage.hpp | 14 +-
.../src/ThinClientCacheDistributionManager.cpp | 4 +-
.../src/ThinClientDistributionManager.cpp | 4 +-
src/cppcache/src/ThinClientHARegion.cpp | 9 +-
src/cppcache/src/ThinClientHARegion.hpp | 2 +-
src/cppcache/src/ThinClientLocatorHelper.cpp | 6 +-
src/cppcache/src/ThinClientPoolDM.cpp | 89 +--
src/cppcache/src/ThinClientPoolDM.hpp | 25 +-
src/cppcache/src/ThinClientPoolHADM.cpp | 4 +-
src/cppcache/src/ThinClientPoolRegion.cpp | 4 +-
src/cppcache/src/ThinClientPoolRegion.hpp | 2 +-
src/cppcache/src/ThinClientPoolStickyDM.cpp | 4 +-
src/cppcache/src/ThinClientPoolStickyDM.hpp | 2 +-
src/cppcache/src/ThinClientPoolStickyHADM.hpp | 2 +-
.../src/ThinClientRedundancyManager.cpp | 36 +-
src/cppcache/src/ThinClientRegion.cpp | 345 ++++-----
src/cppcache/src/ThinClientRegion.hpp | 25 +-
src/cppcache/src/ThinClientStickyManager.cpp | 22 +-
src/cppcache/src/TombstoneList.cpp | 33 +-
src/cppcache/src/TombstoneList.hpp | 15 +-
src/cppcache/src/TrackedMapEntry.hpp | 6 +-
src/cppcache/src/TransactionalOperation.cpp | 45 +-
src/cppcache/src/TssConnectionWrapper.cpp | 4 +-
src/cppcache/src/TssConnectionWrapper.hpp | 2 +-
src/cppcache/src/UserAttributes.cpp | 10 +-
src/cppcache/src/UserAttributes.hpp | 4 +-
src/cppcache/src/Utils.hpp | 11 +-
src/cppcache/src/VersionStamp.cpp | 72 +-
src/cppcache/src/VersionStamp.hpp | 24 +-
.../src/VersionedCacheableObjectPartList.cpp | 41 +-
.../src/VersionedCacheableObjectPartList.hpp | 23 +-
src/cppcache/src/statistics/HostStatSampler.cpp | 2 +-
.../src/statistics/PoolStatsSampler.cpp | 9 +-
.../src/statistics/PoolStatsSampler.hpp | 16 +-
.../src/statistics/StatisticsManager.cpp | 2 +-
src/cppcache/test/DataInputTest.cpp | 6 +-
src/cppcache/test/PdxLocalReaderTest.cpp | 6 +-
src/cppcache/test/SharedBaseTest.cpp | 62 --
src/cppcache/test/SharedPtrTest.cpp | 114 ---
src/cppcache/test/TcrMessage_unittest.cpp | 26 +-
src/quickstart/cpp/CqQuery.cpp | 18 +-
src/quickstart/cpp/Delta.cpp | 2 +-
src/quickstart/cpp/Exceptions.cpp | 2 +-
src/quickstart/cpp/ExecuteFunctions.cpp | 18 +-
src/quickstart/cpp/HACache.cpp | 4 +-
src/quickstart/cpp/MultiuserSecurity.cpp | 6 +-
src/quickstart/cpp/PdxRemoteQuery.cpp | 4 +-
src/quickstart/cpp/PdxSerializer.cpp | 2 +-
src/quickstart/cpp/PoolCqQuery.cpp | 18 +-
src/quickstart/cpp/PoolRemoteQuery.cpp | 4 +-
src/quickstart/cpp/PutAllGetAllOperations.cpp | 2 +-
src/quickstart/cpp/RegisterInterest.cpp | 4 +-
src/quickstart/cpp/RemoteQuery.cpp | 6 +-
.../cpp/plugins/DurableCacheListener.cpp | 4 +-
src/quickstart/cpp/queryobjects/Portfolio.cpp | 10 +-
src/quickstart/cpp/queryobjects/Portfolio.hpp | 12 +-
.../cpp/queryobjects/PortfolioPdx.cpp | 14 +-
.../cpp/queryobjects/PortfolioPdx.hpp | 2 +-
.../cpp/queryobjects/PortfolioPdxAuto.cpp | 8 +-
.../cpp/queryobjects/PortfolioPdxAuto.hpp | 2 +-
src/quickstart/cpp/queryobjects/Position.cpp | 10 +-
src/sqliteimpl/SqLiteImpl.cpp | 8 +-
src/templates/security/PkcsAuthInit.cpp | 2 +-
src/templates/security/UserPasswordAuthInit.cpp | 6 +-
src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp | 4 +-
src/tests/cpp/fwk/UdpIpc.cpp | 2 +-
src/tests/cpp/fwklib/FrameworkTest.cpp | 30 +-
src/tests/cpp/fwklib/FrameworkTest.hpp | 2 +-
src/tests/cpp/fwklib/FwkObjects.hpp | 6 +-
src/tests/cpp/fwklib/PoolHelper.hpp | 10 +-
src/tests/cpp/fwklib/QueryHelper.hpp | 38 +-
src/tests/cpp/fwklib/RegionHelper.hpp | 2 +-
src/tests/cpp/security/PkcsAuthInit.cpp | 2 +-
src/tests/cpp/security/Security.cpp | 35 +-
.../security/XmlAuthzCredentialGenerator.hpp | 6 +-
src/tests/cpp/testobject/ArrayOfByte.hpp | 2 +-
src/tests/cpp/testobject/BatchObject.hpp | 4 +-
.../cpp/testobject/DeltaFastAssetAccount.cpp | 2 +-
.../cpp/testobject/DeltaFastAssetAccount.hpp | 12 +-
src/tests/cpp/testobject/DeltaPSTObject.cpp | 2 +-
src/tests/cpp/testobject/DeltaPSTObject.hpp | 10 +-
src/tests/cpp/testobject/DeltaTestImpl.cpp | 10 +-
src/tests/cpp/testobject/DeltaTestImpl.hpp | 5 +-
src/tests/cpp/testobject/EqStruct.hpp | 2 +-
src/tests/cpp/testobject/FastAsset.hpp | 4 +-
src/tests/cpp/testobject/FastAssetAccount.cpp | 2 +-
src/tests/cpp/testobject/FastAssetAccount.hpp | 6 +-
src/tests/cpp/testobject/InvalidPdxUsage.cpp | 27 +-
src/tests/cpp/testobject/InvalidPdxUsage.hpp | 16 +-
src/tests/cpp/testobject/NestedPdxObject.cpp | 12 +-
src/tests/cpp/testobject/NestedPdxObject.hpp | 9 +-
src/tests/cpp/testobject/NonPdxType.cpp | 10 +-
src/tests/cpp/testobject/NonPdxType.hpp | 4 +-
src/tests/cpp/testobject/PSTObject.cpp | 2 +-
src/tests/cpp/testobject/PSTObject.hpp | 4 +-
src/tests/cpp/testobject/PdxClassV1.cpp | 51 +-
src/tests/cpp/testobject/PdxClassV2.cpp | 51 +-
src/tests/cpp/testobject/PdxType.cpp | 32 +-
src/tests/cpp/testobject/PdxType.hpp | 24 +-
src/tests/cpp/testobject/PdxVersioned1.cpp | 9 +-
src/tests/cpp/testobject/PdxVersioned1.hpp | 4 +-
src/tests/cpp/testobject/PdxVersioned2.cpp | 9 +-
src/tests/cpp/testobject/PdxVersioned2.hpp | 4 +-
src/tests/cpp/testobject/Portfolio.cpp | 18 +-
src/tests/cpp/testobject/Portfolio.hpp | 12 +-
src/tests/cpp/testobject/PortfolioPdx.cpp | 25 +-
src/tests/cpp/testobject/PortfolioPdx.hpp | 2 +-
src/tests/cpp/testobject/Position.cpp | 10 +-
src/tests/cpp/testobject/Position.hpp | 2 +-
src/tests/cpp/testobject/TestObject1.cpp | 4 +-
src/tests/cpp/testobject/TestObject1.hpp | 2 +-
src/tests/cpp/testobject/VariousPdxTypes.cpp | 133 ++--
529 files changed, 7731 insertions(+), 8980 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/packer/solaris/install-build-tools.sh
----------------------------------------------------------------------
diff --git a/packer/solaris/install-build-tools.sh b/packer/solaris/install-build-tools.sh
index 077b4c5..ccdd3e6 100755
--- a/packer/solaris/install-build-tools.sh
+++ b/packer/solaris/install-build-tools.sh
@@ -18,7 +18,9 @@
set -x -e -o pipefail
# Remove meta-packages that prevent installation of updated tools
-pkg uninstall -v entire consolidation/userland/userland-incorporation consolidation/java-8/java-8-incorporation
+pkg uninstall -v entire consolidation/userland/userland-incorporation
+pkg change-facet \
+ facet.version-lock.consolidation/java-8/java-8-incorporation=false
# Install required tools
pkg install -v --accept \
@@ -26,13 +28,8 @@ pkg install -v --accept \
developer/assembler \
developer/documentation-tool/doxygen \
developer/java/jdk-8 \
+ developer/build/gnu-make \
+ developer/build/cmake \
+ developer/versioning/git \
+ archiver/gnu-tar \
text/gnu-patch
-
-# broken developer/build/gnu-make \
-
-
-# too old developer/build/cmake
-/opt/csw/bin/pkgutil -i -y cmake gmake gtar
-
-# dependent perl package conflict developer/versioning/git
-/opt/csw/bin/pkgutil -i -y git
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/packer/solaris/install-opencsw.sh
----------------------------------------------------------------------
diff --git a/packer/solaris/install-opencsw.sh b/packer/solaris/install-opencsw.sh
index a2a36bf..010950e 100644
--- a/packer/solaris/install-opencsw.sh
+++ b/packer/solaris/install-opencsw.sh
@@ -20,9 +20,8 @@ set -e
yes | pkgadd -d http://get.opencsw.org/now all
/opt/csw/bin/pkgutil -U
-echo 'PATH=$PATH:/opt/csw/bin; export PATH' >> .profile
-echo 'PATH=$PATH:/opt/csw/bin; export PATH' >> .bashrc
-
-echo 'PATH=$PATH:/opt/csw/bin; export PATH' >> /etc/skel/.profile
-echo 'PATH=$PATH:/opt/csw/bin; export PATH' >> /etc/skel/.bashrc
-
+p='PATH=$PATH:/opt/csw/bin; export PATH'
+echo "$p" >> ~/.profile
+echo "$p" >> ~/.bashrc
+echo "$p" >> /etc/skel/.profile
+echo "$p" >> /etc/skel/.bashrc
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/packer/solaris/install-solarisstudio.sh
----------------------------------------------------------------------
diff --git a/packer/solaris/install-solarisstudio.sh b/packer/solaris/install-solarisstudio.sh
index 95347c5..11afbeb 100644
--- a/packer/solaris/install-solarisstudio.sh
+++ b/packer/solaris/install-solarisstudio.sh
@@ -22,9 +22,10 @@ pkg set-publisher \
-c /var/pkg/ssl/pkg.oracle.com.certificate.pem \
-G '*' -g https://pkg.oracle.com/solarisstudio/release solarisstudio
-pkg install -v solarisstudio-124/c++ solarisstudio-124/dbx
+pkg install -v solarisstudio-125/c++ solarisstudio-125/dbx
-echo 'PATH=$PATH:/opt/solarisstudio12.4/bin; export PATH' >> ~/.profile
-
-echo 'PATH=$PATH:/opt/solarisstudio12.4/bin; export PATH' >> ~/.bashrc
-echo 'PATH=$PATH:/opt/csw//bin; export PATH' >> ~/.bashrc
+p='PATH=$PATH:/opt/developerstudio12.5/bin; export PATH'
+echo "$p" >> ~/.profile
+echo "$p" >> ~/.bashrc
+echo "$p" >> /etc/skel/.profile
+echo "$p" >> /etc/skel/.bashrc
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/packer/solaris/install-test-tools.sh
----------------------------------------------------------------------
diff --git a/packer/solaris/install-test-tools.sh b/packer/solaris/install-test-tools.sh
index c69fd78..b7b543d 100755
--- a/packer/solaris/install-test-tools.sh
+++ b/packer/solaris/install-test-tools.sh
@@ -18,12 +18,12 @@
set -x -e -o pipefail
# Remove meta-packages that prevent installation of updated tools
-pkg uninstall -v entire consolidation/userland/userland-incorporation consolidation/java-8/java-8-incorporation
+pkg uninstall -v entire consolidation/userland/userland-incorporation
+pkg change-facet \
+ facet.version-lock.consolidation/java-8/java-8-incorporation=false
# Install required tools
pkg install -v --accept \
developer/java/jdk-8 \
+ developer/build/cmake \
archiver/gnu-tar
-
-# too old developer/build/cmake
-/opt/csw/bin/pkgutil -i -y cmake
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index f3ab002..67c4d97 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -67,7 +67,7 @@ namespace Apache
CacheLoaderGeneric<TKey, TValue>^ clg = gcnew CacheLoaderGeneric<TKey, TValue>();
clg->SetCacheLoader(cacheLoader);
loaderptr = new apache::geode::client::ManagedCacheLoaderGeneric( /*clg,*/ cacheLoader );
- ((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
+ ((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.get())->setptr(clg);
}
NativePtr->setCacheLoader( loaderptr );
}
@@ -80,7 +80,7 @@ namespace Apache
CacheWriterGeneric<TKey, TValue>^ cwg = gcnew CacheWriterGeneric<TKey, TValue>();
cwg->SetCacheWriter(cacheWriter);
writerptr = new apache::geode::client::ManagedCacheWriterGeneric( /*cwg,*/ cacheWriter );
- ((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
+ ((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.get())->setptr(cwg);
}
NativePtr->setCacheWriter( writerptr );
}
@@ -94,7 +94,7 @@ namespace Apache
clg->SetCacheListener(cacheListener);
//listenerptr = new apache::geode::client::ManagedCacheListenerGeneric( (ICacheListener<Object^, Object^>^)cacheListener );
listenerptr = new apache::geode::client::ManagedCacheListenerGeneric( /*clg,*/ cacheListener );
- ((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
+ ((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.get())->setptr(clg);
}
NativePtr->setCacheListener( listenerptr );
}
@@ -110,13 +110,13 @@ namespace Apache
FixedPartitionResolverGeneric<TKey, TValue>^ prg = gcnew FixedPartitionResolverGeneric<TKey, TValue>();
prg->SetPartitionResolver(partitionresolver);
resolverptr = new apache::geode::client::ManagedFixedPartitionResolverGeneric( partitionresolver );
- ((apache::geode::client::ManagedFixedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);
+ ((apache::geode::client::ManagedFixedPartitionResolverGeneric*)resolverptr.get())->setptr(prg);
}
else {
PartitionResolverGeneric<TKey, TValue>^ prg = gcnew PartitionResolverGeneric<TKey, TValue>();
prg->SetPartitionResolver(partitionresolver);
resolverptr = new apache::geode::client::ManagedPartitionResolverGeneric( partitionresolver );
- ((apache::geode::client::ManagedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);
+ ((apache::geode::client::ManagedPartitionResolverGeneric*)resolverptr.get())->setptr(prg);
}
}
NativePtr->setPartitionResolver( resolverptr );
@@ -205,7 +205,7 @@ namespace Apache
PersistenceManagerGeneric<TKey, TValue>^ clg = gcnew PersistenceManagerGeneric<TKey, TValue>();
clg->SetPersistenceManager(persistenceManager);
persistenceManagerptr = new apache::geode::client::ManagedPersistenceManagerGeneric( /*clg,*/ persistenceManager );
- ((apache::geode::client::ManagedPersistenceManagerGeneric*)persistenceManagerptr.ptr())->setptr(clg);
+ ((apache::geode::client::ManagedPersistenceManagerGeneric*)persistenceManagerptr.get())->setptr(clg);
}
apache::geode::client::PropertiesPtr configptr(GetNativePtr<apache::geode::client::Properties>( config ) );
NativePtr->setPersistenceManager( persistenceManagerptr, configptr );
@@ -321,7 +321,7 @@ namespace Apache
apache::geode::client::RegionAttributesPtr& nativeptr(
NativePtr->createRegionAttributes());
- return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
+ return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.get());
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index 515f114..081dccb 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -109,7 +109,7 @@ namespace Apache
CacheListenerGeneric<TKey, TValue>^ clg = gcnew CacheListenerGeneric<TKey, TValue>();
clg->SetCacheListener(cacheListener);
listenerptr = new apache::geode::client::ManagedCacheListenerGeneric( /*clg,*/ cacheListener );
- ((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
+ ((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.get())->setptr(clg);
}
NativePtr->setCacheListener( listenerptr );
}
@@ -135,7 +135,7 @@ namespace Apache
CacheLoaderGeneric<TKey, TValue>^ clg = gcnew CacheLoaderGeneric<TKey, TValue>();
clg->SetCacheLoader(cacheLoader);
loaderptr = new apache::geode::client::ManagedCacheLoaderGeneric( /*clg,*/ cacheLoader );
- ((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
+ ((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.get())->setptr(clg);
}
NativePtr->setCacheLoader( loaderptr );
}
@@ -161,7 +161,7 @@ namespace Apache
CacheWriterGeneric<TKey, TValue>^ cwg = gcnew CacheWriterGeneric<TKey, TValue>();
cwg->SetCacheWriter(cacheWriter);
writerptr = new apache::geode::client::ManagedCacheWriterGeneric( /*cwg,*/ cacheWriter );
- ((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
+ ((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.get())->setptr(cwg);
}
NativePtr->setCacheWriter( writerptr );
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/Cache.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.cpp b/src/clicache/src/Cache.cpp
index 278aceb..1906830 100644
--- a/src/clicache/src/Cache.cpp
+++ b/src/clicache/src/Cache.cpp
@@ -187,7 +187,7 @@ namespace Apache
break;
}
- return RegionFactory::Create(NativePtr->createRegionFactory(preDefineRegionAttr).ptr());
+ return RegionFactory::Create(NativePtr->createRegionFactory(preDefineRegionAttr).get());
_GF_MG_EXCEPTION_CATCH_ALL2
}
@@ -206,7 +206,7 @@ namespace Apache
_GF_MG_EXCEPTION_TRY2
- return AuthenticatedCache::Create( (NativePtr->createAuthenticatedView(credPtr)).ptr());
+ return AuthenticatedCache::Create( (NativePtr->createAuthenticatedView(credPtr)).get());
_GF_MG_EXCEPTION_CATCH_ALL2
}
@@ -245,7 +245,7 @@ namespace Apache
_GF_MG_EXCEPTION_TRY2
- return AuthenticatedCache::Create( (NativePtr->createAuthenticatedView(credPtr, mg_poolName.CharPtr)).ptr());
+ return AuthenticatedCache::Create( (NativePtr->createAuthenticatedView(credPtr, mg_poolName.CharPtr)).get());
_GF_MG_EXCEPTION_CATCH_ALL2
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CacheFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.cpp b/src/clicache/src/CacheFactory.cpp
index 02420e8..8c71107 100644
--- a/src/clicache/src/CacheFactory.cpp
+++ b/src/clicache/src/CacheFactory.cpp
@@ -52,8 +52,8 @@ namespace Apache
GetNativePtr<apache::geode::client::Properties>(dsProps));
apache::geode::client::CacheFactoryPtr& nativeptr( apache::geode::client::CacheFactory::createCacheFactory( nativepropsptr) );
- if (nativeptr.ptr() != nullptr)
- return gcnew CacheFactory( nativeptr.ptr(), dsProps );
+ if (nativeptr.get() != nullptr)
+ return gcnew CacheFactory( nativeptr.get(), dsProps );
return nullptr;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CacheTransactionManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.cpp b/src/clicache/src/CacheTransactionManager.cpp
index 71b1f8d..f8139a1 100644
--- a/src/clicache/src/CacheTransactionManager.cpp
+++ b/src/clicache/src/CacheTransactionManager.cpp
@@ -75,7 +75,7 @@ namespace Apache
{
_GF_MG_EXCEPTION_TRY2
- return Apache::Geode::Client::TransactionId::Create( NativePtr->suspend().ptr() );
+ return Apache::Geode::Client::TransactionId::Create( NativePtr->suspend().get() );
_GF_MG_EXCEPTION_CATCH_ALL2
}
@@ -83,7 +83,7 @@ namespace Apache
{
_GF_MG_EXCEPTION_TRY2
- return Apache::Geode::Client::TransactionId::Create( NativePtr->getTransactionId().ptr() );
+ return Apache::Geode::Client::TransactionId::Create( NativePtr->getTransactionId().get() );
_GF_MG_EXCEPTION_CATCH_ALL2
}
@@ -161,7 +161,7 @@ namespace Apache
TransactionWriterGeneric<TKey, TValue>^ twg = gcnew TransactionWriterGeneric<TKey, TValue> ();
twg->SetTransactionWriter(transactionWriter);
writerPtr = new apache::geode::client::ManagedTransactionWriterGeneric( transactionWriter );
- ((apache::geode::client::ManagedTransactionWriterGeneric*)writerPtr.ptr())->setptr(twg);
+ ((apache::geode::client::ManagedTransactionWriterGeneric*)writerPtr.get())->setptr(twg);
}
NativePtr->setWriter( writerPtr );
@@ -180,7 +180,7 @@ namespace Apache
TransactionListenerGeneric<TKey, TValue>^ twg = gcnew TransactionListenerGeneric<TKey, TValue> ();
twg->SetTransactionListener(transactionListener);
listenerPtr = new apache::geode::client::ManagedTransactionListenerGeneric( transactionListener );
- ((apache::geode::client::ManagedTransactionListenerGeneric*)listenerPtr.ptr())->setptr(twg);
+ ((apache::geode::client::ManagedTransactionListenerGeneric*)listenerPtr.get())->setptr(twg);
}
NativePtr->addListener( listenerPtr );
@@ -199,7 +199,7 @@ namespace Apache
TransactionListenerGeneric<TKey, TValue>^ twg = gcnew TransactionListenerGeneric<TKey, TValue> ();
twg->SetTransactionListener(transactionListener);
listenerPtr = new apache::geode::client::ManagedTransactionListenerGeneric( transactionListener );
- ((apache::geode::client::ManagedTransactionListenerGeneric*)listenerPtr.ptr())->setptr(twg);
+ ((apache::geode::client::ManagedTransactionListenerGeneric*)listenerPtr.get())->setptr(twg);
}
NativePtr->removeListener( listenerPtr );
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableBuiltins.hpp b/src/clicache/src/CacheableBuiltins.hpp
index c0e11d6..3cee562 100644
--- a/src/clicache/src/CacheableBuiltins.hpp
+++ b/src/clicache/src/CacheableBuiltins.hpp
@@ -56,7 +56,7 @@ namespace Apache
{
apache::geode::client::SharedPtr<TNative>& nativeptr = TNative::create();
- SetSP(nativeptr.ptr());
+ SetSP(nativeptr.get());
}
/// <summary>
@@ -67,7 +67,7 @@ namespace Apache
{
apache::geode::client::SharedPtr<TNative>& nativeptr = TNative::create(value);
- SetSP(nativeptr.ptr());
+ SetSP(nativeptr.get());
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CacheableHashSet.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashSet.hpp b/src/clicache/src/CacheableHashSet.hpp
index ab59f8c..aa6085b 100644
--- a/src/clicache/src/CacheableHashSet.hpp
+++ b/src/clicache/src/CacheableHashSet.hpp
@@ -57,7 +57,7 @@ namespace Apache
HSTYPE* set = static_cast<HSTYPE*>(nptr());
for (typename HSTYPE::Iterator iter = set->begin();
iter != set->end(); ++iter) {
- //Generic::ICacheableKey^ key = SafeGenericUMKeyConvert<ICacheableKey^>((*iter).ptr());
+ //Generic::ICacheableKey^ key = SafeGenericUMKeyConvert<ICacheableKey^>((*iter).get());
Object^ key = Serializable::GetManagedValueGeneric<Object^>((*iter));
output->WriteObject(key);
}
@@ -158,7 +158,7 @@ namespace Apache
throw gcnew System::InvalidOperationException(
"Call MoveNext first.");
}
- //return SafeGenericUMKeyConvert<Client::ICacheableKey^>((*(*NativePtr())).ptr());
+ //return SafeGenericUMKeyConvert<Client::ICacheableKey^>((*(*NativePtr())).get());
return Serializable::GetManagedValueGeneric<Object^>((*(*NativePtr())));
}
}
@@ -520,7 +520,7 @@ namespace Apache
/// </summary>
/// <param name="size">The initial size of the HashSet.</param>
inline CacheableHashSetType<TYPEID, HSTYPE>(System::Int32 size)
- : Serializable(HSTYPE::create(size).ptr())
+ : Serializable(HSTYPE::create(size).get())
{ }
};
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CacheableObjectArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp
index 9a41846..c4caa7d 100644
--- a/src/clicache/src/CacheableObjectArray.cpp
+++ b/src/clicache/src/CacheableObjectArray.cpp
@@ -99,7 +99,7 @@ namespace Apache
apache::geode::client::CacheablePtr value;
for (System::Int32 index = 0; index < len; ++index) {
nativeInput.readObject(value);
- Add(SafeUMSerializableConvert(value.ptr()));
+ Add(SafeUMSerializableConvert(value.get()));
}
_GF_MG_EXCEPTION_CATCH_ALL
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CqAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.cpp b/src/clicache/src/CqAttributesFactory.cpp
index e30a707..9903d0f 100644
--- a/src/clicache/src/CqAttributesFactory.cpp
+++ b/src/clicache/src/CqAttributesFactory.cpp
@@ -47,15 +47,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( cqListener) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqStatusListenerGeneric*)listenerptr.ptr())->setptr(sLstr);
+ ((apache::geode::client::ManagedCqStatusListenerGeneric*)listenerptr.get())->setptr(sLstr);
}
else {
//TODO::split
@@ -66,15 +66,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( cqListener) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqListenerGeneric*)listenerptr.ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqListenerGeneric*)listenerptr.get())->setptr(cqlg);
}
}
@@ -97,15 +97,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( cqListeners[i]) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListeners[i]] = (IntPtr)cptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListeners[i]] = (IntPtr)cptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListeners[i], (IntPtr)cptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListeners[i], (IntPtr)cptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].get())->setptr(cqlg);
}
else {
ICqListener<TKey, TResult>^ lister = cqListeners[i];
@@ -117,15 +117,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( cqListeners[i]) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListeners[i]] = (IntPtr)cptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListeners[i]] = (IntPtr)cptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListeners[i], (IntPtr)cptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListeners[i], (IntPtr)cptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqListenerGeneric*)vrr[i].ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqListenerGeneric*)vrr[i].get())->setptr(cqlg);
}
}
@@ -135,7 +135,7 @@ namespace Apache
generic<class TKey, class TResult>
Client::CqAttributes<TKey, TResult>^ CqAttributesFactory<TKey, TResult>::Create( )
{
- return Client::CqAttributes<TKey, TResult>::Create(NativePtr->create().ptr());
+ return Client::CqAttributes<TKey, TResult>::Create(NativePtr->create().get());
} // namespace Client
} // namespace Geode
} // namespace Apache
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CqAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp
index 68adf79..c6950b4 100644
--- a/src/clicache/src/CqAttributesMutator.cpp
+++ b/src/clicache/src/CqAttributesMutator.cpp
@@ -45,16 +45,16 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey(cqListener) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.get());
}
}
finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqStatusListenerGeneric*)listenerptr.ptr())->setptr(sLstr);
+ ((apache::geode::client::ManagedCqStatusListenerGeneric*)listenerptr.get())->setptr(sLstr);
}
else {
//TODO::split
@@ -65,15 +65,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey(cqListener) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[cqListener] = (IntPtr)listenerptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(cqListener, (IntPtr)listenerptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqListenerGeneric*)listenerptr.ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqListenerGeneric*)listenerptr.get())->setptr(cqlg);
}
}
NativePtr->addCqListener( listenerptr );
@@ -88,7 +88,7 @@ namespace Apache
cqlg->AddCqListener(cqListener);
apache::geode::client::CqStatusListenerPtr lptr(new apache::geode::client::ManagedCqStatusListenerGeneric(
(Client::ICqStatusListener<TKey, TResult>^) lister ));
- ((apache::geode::client::ManagedCqStatusListenerGeneric*)lptr.ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqStatusListenerGeneric*)lptr.get())->setptr(cqlg);
try {
IntPtr value;
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
@@ -105,7 +105,7 @@ namespace Apache
cqlg->AddCqListener(cqListener);
apache::geode::client::CqListenerPtr lptr(new apache::geode::client::ManagedCqListenerGeneric(
(Client::ICqListener<TKey, TResult>^) cqListener ));
- ((apache::geode::client::ManagedCqListenerGeneric*)lptr.ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqListenerGeneric*)lptr.get())->setptr(cqlg);
try {
IntPtr value;
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
@@ -135,15 +135,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( newListeners[i]) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[newListeners[i]] = (IntPtr)cptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[newListeners[i]] = (IntPtr)cptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(newListeners[i], (IntPtr)cptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(newListeners[i], (IntPtr)cptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].get())->setptr(cqlg);
}
else {
Client::ICqListener<TKey, TResult>^ lister = newListeners[i];
@@ -155,15 +155,15 @@ namespace Apache
try {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->AcquireWriterLock(-1);
if ( CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->ContainsKey( newListeners[i]) ) {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[newListeners[i]] = (IntPtr)cptr.ptr();
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict[newListeners[i]] = (IntPtr)cptr.get();
}
else {
- CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(newListeners[i], (IntPtr)cptr.ptr());
+ CqListenerHelper<TKey, TResult>::m_ManagedVsUnManagedCqLstrDict->Add(newListeners[i], (IntPtr)cptr.get());
}
} finally {
CqListenerHelper<TKey, TResult>::g_readerWriterLock->ReleaseWriterLock();
}
- ((apache::geode::client::ManagedCqListenerGeneric*)vrr[i].ptr())->setptr(cqlg);
+ ((apache::geode::client::ManagedCqListenerGeneric*)vrr[i].get())->setptr(cqlg);
}
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp
index 1e8461b..eb50ad7 100644
--- a/src/clicache/src/CqQuery.cpp
+++ b/src/clicache/src/CqQuery.cpp
@@ -48,7 +48,7 @@ namespace Apache
apache::geode::client::CqResultsPtr& nativeptr =
NativePtr->executeWithInitialResults(timeout);
- if (nativeptr.ptr() == NULL) return nullptr;
+ if (nativeptr.get() == NULL) return nullptr;
apache::geode::client::ResultSet* resultptr = dynamic_cast<apache::geode::client::ResultSet*>(
nativeptr.ptr( ) );
@@ -97,25 +97,25 @@ namespace Apache
generic<class TKey, class TResult>
Query<TResult>^ CqQuery<TKey, TResult>::GetQuery( )
{
- return Query<TResult>::Create(NativePtr->getQuery().ptr());
+ return Query<TResult>::Create(NativePtr->getQuery().get());
}
generic<class TKey, class TResult>
CqAttributes<TKey, TResult>^ CqQuery<TKey, TResult>::GetCqAttributes( )
{
- return CqAttributes<TKey, TResult>::Create(NativePtr->getCqAttributes( ).ptr());
+ return CqAttributes<TKey, TResult>::Create(NativePtr->getCqAttributes( ).get());
}
generic<class TKey, class TResult>
CqAttributesMutator<TKey, TResult>^ CqQuery<TKey, TResult>::GetCqAttributesMutator( )
{
- return CqAttributesMutator<TKey, TResult>::Create(NativePtr->getCqAttributesMutator().ptr());
+ return CqAttributesMutator<TKey, TResult>::Create(NativePtr->getCqAttributesMutator().get());
}
generic<class TKey, class TResult>
CqStatistics^ CqQuery<TKey, TResult>::GetStatistics( )
{
- return CqStatistics::Create(NativePtr->getStatistics().ptr());
+ return CqStatistics::Create(NativePtr->getStatistics().get());
}
generic<class TKey, class TResult>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp
index f170a5b..bd29a91 100644
--- a/src/clicache/src/DistributedSystem.cpp
+++ b/src/clicache/src/DistributedSystem.cpp
@@ -156,7 +156,7 @@ namespace Apache
// DistributedSystem::AppDomainInstancePostInitialization();
- return Create(nativeptr.ptr());
+ return Create(nativeptr.get());
_GF_MG_EXCEPTION_CATCH_ALL2
@@ -217,7 +217,7 @@ namespace Apache
DistributedSystem::AppDomainInstancePostInitialization();
- return Create(nativeptr.ptr());
+ return Create(nativeptr.get());
_GF_MG_EXCEPTION_CATCH_ALL
@@ -750,7 +750,7 @@ namespace Apache
void DistributedSystem::AppDomainInstancePostInitialization()
{
//to create .net memory pressure handler
- Create(apache::geode::client::DistributedSystem::getInstance().ptr());
+ Create(apache::geode::client::DistributedSystem::getInstance().get());
}
void DistributedSystem::UnregisterBuiltinManagedTypes()
@@ -826,7 +826,7 @@ namespace Apache
{
apache::geode::client::DistributedSystemPtr& nativeptr(
apache::geode::client::DistributedSystem::getInstance());
- return Create(nativeptr.ptr());
+ return Create(nativeptr.get());
}
void DistributedSystem::HandleMemoryPressure(System::Object^ state)
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index 7192066..9388670 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -114,7 +114,7 @@ namespace Apache
{
Exception^ innerException = nullptr;
const apache::geode::client::ExceptionPtr& cause = nativeEx.getCause();
- if (cause != NULLPTR) {
+ if (cause != nullptr) {
innerException = GeodeException::Get(*cause);
}
String^ exName = gcnew String( nativeEx.getName( ) );
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp
index 03eb11e..8f25654 100644
--- a/src/clicache/src/ExceptionTypes.hpp
+++ b/src/clicache/src/ExceptionTypes.hpp
@@ -166,7 +166,7 @@ namespace Apache
mg_exStr.CharPtr, NULL, false, cause));
}
}
- return NULLPTR;
+ return nullptr;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/Execution.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.cpp b/src/clicache/src/Execution.cpp
index 3034382..6037299 100644
--- a/src/clicache/src/Execution.cpp
+++ b/src/clicache/src/Execution.cpp
@@ -48,7 +48,7 @@ namespace Apache
rsptr->push_back(Serializable::GetUnmanagedValueGeneric<TFilter>( item ));
}
- return Execution<TResult>::Create(NativePtr->withFilter(rsptr).ptr(), this->m_rc);
+ return Execution<TResult>::Create(NativePtr->withFilter(rsptr).get(), this->m_rc);
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
else {
@@ -63,7 +63,7 @@ namespace Apache
_GF_MG_EXCEPTION_TRY2/* due to auto replace */
apache::geode::client::CacheablePtr argsptr( Serializable::GetUnmanagedValueGeneric<TArgs>( args ) );
- return Execution<TResult>::Create(NativePtr->withArgs(argsptr).ptr(), this->m_rc);
+ return Execution<TResult>::Create(NativePtr->withArgs(argsptr).get(), this->m_rc);
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
@@ -77,9 +77,9 @@ namespace Apache
rcg->SetResultCollector(rc);
rcptr = new apache::geode::client::ManagedResultCollectorGeneric( rcg );
- //((apache::geode::client::ManagedResultCollectorGeneric*)rcptr.ptr())->setptr(rcg);
+ //((apache::geode::client::ManagedResultCollectorGeneric*)rcptr.get())->setptr(rcg);
}
- return Execution<TResult>::Create( NativePtr->withCollector(rcptr).ptr(), rc);
+ return Execution<TResult>::Create( NativePtr->withCollector(rcptr).get(), rc);
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
@@ -90,7 +90,7 @@ namespace Apache
ManagedString mg_function( func );
apache::geode::client::ResultCollectorPtr rc = NativePtr->execute(mg_function.CharPtr, timeout);
if(m_rc == nullptr)
- return gcnew ResultCollector<TResult>(rc.ptr());
+ return gcnew ResultCollector<TResult>(rc.get());
else
return m_rc;
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp
index 93d07c8..9fd618f 100644
--- a/src/clicache/src/LocalRegion.cpp
+++ b/src/clicache/src/LocalRegion.cpp
@@ -40,7 +40,7 @@ namespace Apache
{
apache::geode::client::CacheableKeyPtr keyptr( Serializable::GetUnmanagedValueGeneric<TKey>( key ) );
apache::geode::client::CacheablePtr nativeptr(this->getRegionEntryValue(keyptr));
- if (nativeptr == NULLPTR)
+ if (nativeptr == nullptr)
{
throw gcnew KeyNotFoundException("The given key was not present in the region");
}
@@ -53,11 +53,11 @@ namespace Apache
{
_GF_MG_EXCEPTION_TRY2/* due to auto replace */
apache::geode::client::RegionEntryPtr entryPtr = NativePtr->getEntry( keyptr );
- if (entryPtr != NULLPTR) {
+ if (entryPtr != nullptr) {
return entryPtr->getValue() ;
}
else {
- return NULLPTR;
+ return nullptr;
}
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
@@ -81,7 +81,7 @@ namespace Apache
{
apache::geode::client::CacheableKeyPtr keyptr( Serializable::GetUnmanagedValueGeneric<TKey>( key ) );
apache::geode::client::CacheablePtr nativeptr(this->getRegionEntryValue(keyptr));
- if (nativeptr == NULLPTR)
+ if (nativeptr == nullptr)
{
throw gcnew KeyNotFoundException("The given key was not present in the region");
}
@@ -155,15 +155,15 @@ namespace Apache
generic<class TKey, class TValue>
bool LocalRegion<TKey, TValue>::AreValuesEqual(apache::geode::client::CacheablePtr& val1, apache::geode::client::CacheablePtr& val2)
{
- if ( val1 == NULLPTR && val2 == NULLPTR )
+ if ( val1 == nullptr && val2 == nullptr )
{
return true;
}
- else if ((val1 == NULLPTR && val2 != NULLPTR) || (val1 != NULLPTR && val2 == NULLPTR))
+ else if ((val1 == nullptr && val2 != nullptr) || (val1 != nullptr && val2 == nullptr))
{
return false;
}
- else if( val1 != NULLPTR && val2 != NULLPTR )
+ else if( val1 != nullptr && val2 != nullptr )
{
if (val1->classId() != val2->classId() || val1->typeId() != val2->typeId())
{
@@ -192,7 +192,7 @@ namespace Apache
apache::geode::client::CacheableKeyPtr keyptr( Serializable::GetUnmanagedValueGeneric<TKey>( keyValuePair.Key ) );
apache::geode::client::CacheablePtr nativeptr(this->getRegionEntryValue(keyptr));
//This means that key is not present.
- if (nativeptr == NULLPTR) {
+ if (nativeptr == nullptr) {
return false;
}
TValue value = Serializable::GetManagedValueGeneric<TValue>(nativeptr);
@@ -216,7 +216,7 @@ namespace Apache
{
apache::geode::client::CacheableKeyPtr keyptr( Serializable::GetUnmanagedValueGeneric<TKey>( key ) );
apache::geode::client::CacheablePtr nativeptr(this->getRegionEntryValue(keyptr));
- if (nativeptr == NULLPTR) {
+ if (nativeptr == nullptr) {
val = TValue();
return false;
}
@@ -552,7 +552,7 @@ namespace Apache
apache::geode::client::RegionAttributesPtr& nativeptr( NativePtr->getAttributes( ) );
- return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
+ return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.get());
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
@@ -610,7 +610,7 @@ namespace Apache
GetNativePtrFromSBWrap<apache::geode::client::RegionAttributes>( attributes ) );*/
apache::geode::client::RegionPtr& nativeptr( NativePtr->createSubregion(
- mg_subregionName.CharPtr, /*p_attrs*/NULLPTR ) );
+ mg_subregionName.CharPtr, /*p_attrs*/nullptr ) );
return Region<TKey, TValue>::Create( nativeptr.ptr( ) )->GetLocalView();
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
@@ -681,7 +681,7 @@ namespace Apache
apache::geode::client::RegionServicePtr& nativeptr( NativePtr->getRegionService( ) );
- apache::geode::client::Cache* realCache = dynamic_cast<apache::geode::client::Cache*>(nativeptr.ptr());
+ apache::geode::client::Cache* realCache = dynamic_cast<apache::geode::client::Cache*>(nativeptr.get());
if(realCache != NULL)
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/Pool.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Pool.cpp b/src/clicache/src/Pool.cpp
index 800caa9..3a3e68f 100644
--- a/src/clicache/src/Pool.cpp
+++ b/src/clicache/src/Pool.cpp
@@ -153,7 +153,7 @@ namespace Apache
array<String^>^ result = gcnew array<String^>(length);
for (int item = 0; item < length; item++)
{
- result[item] = CacheableString::GetString(locators[item].ptr());
+ result[item] = CacheableString::GetString(locators[item].get());
}
return result;
}
@@ -173,7 +173,7 @@ namespace Apache
array<String^>^ result = gcnew array<String^>(length);
for (int item = 0; item < length; item++)
{
- result[item] = CacheableString::GetString(servers[item].ptr());
+ result[item] = CacheableString::GetString(servers[item].get());
}
return result;
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/PoolFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/PoolFactory.cpp b/src/clicache/src/PoolFactory.cpp
index c4998bb..427453a 100644
--- a/src/clicache/src/PoolFactory.cpp
+++ b/src/clicache/src/PoolFactory.cpp
@@ -282,7 +282,7 @@ namespace Apache
ManagedString mg_name( name );
apache::geode::client::PoolPtr & pool = NativePtr->create(mg_name.CharPtr);
- return Pool/*<TKey, TValue>*/::Create(pool.ptr());
+ return Pool/*<TKey, TValue>*/::Create(pool.get());
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
} // namespace Client
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/PoolManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/PoolManager.cpp b/src/clicache/src/PoolManager.cpp
index 9796f59..d609860 100644
--- a/src/clicache/src/PoolManager.cpp
+++ b/src/clicache/src/PoolManager.cpp
@@ -37,7 +37,7 @@ namespace Apache
//generic<class TKey, class TValue>
PoolFactory/*<TKey, TValue>*/^ PoolManager/*<TKey, TValue>*/::CreateFactory()
{
- return PoolFactory/*<TKey, TValue>*/::Create(apache::geode::client::PoolManager::createFactory().ptr());
+ return PoolFactory/*<TKey, TValue>*/::Create(apache::geode::client::PoolManager::createFactory().get());
}
//generic<class TKey, class TValue>
@@ -47,8 +47,8 @@ namespace Apache
Dictionary<String^, Pool/*<TKey, TValue>*/^>^ result = gcnew Dictionary<String^, Pool/*<TKey, TValue>*/^>();
for (apache::geode::client::HashMapOfPools::Iterator iter = pools.begin(); iter != pools.end(); ++iter)
{
- String^ key = CacheableString::GetString(iter.first().ptr());
- Pool/*<TKey, TValue>*/^ val = Pool/*<TKey, TValue>*/::Create(iter.second().ptr());
+ String^ key = CacheableString::GetString(iter.first().get());
+ Pool/*<TKey, TValue>*/^ val = Pool/*<TKey, TValue>*/::Create(iter.second().get());
result->Add(key, val);
}
return result;
@@ -59,14 +59,14 @@ namespace Apache
{
ManagedString mg_name( name );
apache::geode::client::PoolPtr pool = apache::geode::client::PoolManager::find(mg_name.CharPtr);
- return Pool/*<TKey, TValue>*/::Create(pool.ptr());
+ return Pool/*<TKey, TValue>*/::Create(pool.get());
}
//generic <class TKey, class TValue>
Pool/*<TKey, TValue>*/^ PoolManager/*<TKey, TValue>*/::Find(Client::Region<Object^, Object^>^ region)
{
- //return Pool::Create(apache::geode::client::PoolManager::find(apache::geode::client::RegionPtr(GetNativePtr<apache::geode::client::Region>(region))).ptr());
- return Pool/*<TKey, TValue>*/::Create(apache::geode::client::PoolManager::find(apache::geode::client::RegionPtr(region->_NativePtr)).ptr());
+ //return Pool::Create(apache::geode::client::PoolManager::find(apache::geode::client::RegionPtr(GetNativePtr<apache::geode::client::Region>(region))).get());
+ return Pool/*<TKey, TValue>*/::Create(apache::geode::client::PoolManager::find(apache::geode::client::RegionPtr(region->_NativePtr)).get());
}
//generic<class TKey, class TValue>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/Properties.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Properties.cpp b/src/clicache/src/Properties.cpp
index 843ac40..e7b43c6 100644
--- a/src/clicache/src/Properties.cpp
+++ b/src/clicache/src/Properties.cpp
@@ -114,7 +114,7 @@ namespace Apache
generic<class TPropKey, class TPropValue>
IGeodeSerializable^ Properties<TPropKey, TPropValue>::ConvertCacheableString(apache::geode::client::CacheablePtr& value)
{
- apache::geode::client::CacheableString * cs = dynamic_cast<apache::geode::client::CacheableString *>( value.ptr() );
+ apache::geode::client::CacheableString * cs = dynamic_cast<apache::geode::client::CacheableString *>( value.get() );
if ( cs == NULL) {
return SafeUMSerializableConvert( value.ptr( ) );
}
@@ -261,7 +261,7 @@ namespace Apache
apache::geode::client::CacheableStringPtr csPtr;
CacheableString::GetCacheableString(cStr->Value, csPtr);
- return csPtr.ptr();
+ return csPtr.get();
}
*/
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/clicache/src/QueryService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/QueryService.cpp b/src/clicache/src/QueryService.cpp
index f60ce3c..f4301e8 100644
--- a/src/clicache/src/QueryService.cpp
+++ b/src/clicache/src/QueryService.cpp
@@ -44,7 +44,7 @@ namespace Apache
_GF_MG_EXCEPTION_TRY2/* due to auto replace */
return Query<TResult>::Create(NativePtr->newQuery(
- mg_queryStr.CharPtr).ptr());
+ mg_queryStr.CharPtr).get());
_GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
}
@@ -57,7 +57,7 @@ namespace Apache
try
{
return CqQuery<TKey, TResult>::Create(NativePtr->newCq(
- mg_queryStr.CharPtr, attr, isDurable).ptr());
+ mg_queryStr.CharPtr, attr, isDurable).get());
}
catch (const apache::geode::client::Exception& ex)
{
@@ -74,7 +74,7 @@ namespace Apache
try
{
return CqQuery<TKey, TResult>::Create(NativePtr->newCq(
- mg_nameStr.CharPtr, mg_queryStr.CharPtr, attr, isDurable).ptr());
+ mg_nameStr.CharPtr, mg_queryStr.CharPtr, attr, isDurable).get());
}
catch (const apache::geode::client::Exception& ex)
{
@@ -106,7 +106,7 @@ namespace Apache
for (System::Int32 index = 0; index < vrr.size(); index++)
{
- cqs[index] = CqQuery<TKey, TResult>::Create(vrr[index].ptr());
+ cqs[index] = CqQuery<TKey, TResult>::Create(vrr[index].get());
}
return cqs;
}
@@ -123,7 +123,7 @@ namespace Apache
try
{
return CqQuery<TKey, TResult>::Create(NativePtr->getCq(
- mg_queryStr.CharPtr).ptr());
+ mg_queryStr.CharPtr).get());
}
catch (const apache::geode::client::Exception& ex)
{
@@ -162,7 +162,7 @@ namespace Apache
{
try
{
- return CqServiceStatistics::Create(NativePtr->getCqServiceStatistics().ptr());
+ return CqServiceStatistics::Create(NativePtr->getCqServiceStatistics().get());
}
catch (const apache::geode::client::Exception& ex)
{
@@ -176,7 +176,7 @@ namespace Apache
try
{
apache::geode::client::CacheableArrayListPtr durableCqsArrayListPtr = NativePtr->getAllDurableCqsFromServer();
- int length = durableCqsArrayListPtr != NULLPTR ? durableCqsArrayListPtr->length() : 0;
+ int length = durableCqsArrayListPtr != nullptr ? durableCqsArrayListPtr->length() : 0;
System::Collections::Generic::List<String^>^ durableCqsList = gcnew System::Collections::Generic::List<String^>();
if (length > 0)
{