Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E75DD200C87 for ; Wed, 17 May 2017 19:49:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E5E38160BBA; Wed, 17 May 2017 17:49:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DB459160BE4 for ; Wed, 17 May 2017 19:49:46 +0200 (CEST) Received: (qmail 26411 invoked by uid 500); 17 May 2017 17:49:45 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 24411 invoked by uid 99); 17 May 2017 17:49:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2017 17:49:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 18521F21A9; Wed, 17 May 2017 17:49:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbarrett@apache.org To: commits@geode.apache.org Date: Wed, 17 May 2017 17:49:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/46] geode-native git commit: GEODE-2741: Remove custom shared pointer from cppcache archived-at: Wed, 17 May 2017 17:49:59 -0000 http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/testThinClientPdxTests.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp index 756eac9..445142b 100644 --- a/src/cppcache/integration-test/testThinClientPdxTests.cpp +++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp @@ -81,7 +81,7 @@ bool genericValCompare(T1 value1, T2 value2) /*const*/ } void initClient(const bool isthinClient, bool isPdxIgnoreUnreadFields, - const PropertiesPtr& configPtr = NULLPTR) { + const PropertiesPtr& configPtr = nullptr) { LOGINFO("isPdxIgnoreUnreadFields = %d ", isPdxIgnoreUnreadFields); if (cacheHelper == NULL) { cacheHelper = new CacheHelper(isthinClient, isPdxIgnoreUnreadFields, false, @@ -94,7 +94,7 @@ void initClient(const bool isthinClient, bool isPdxIgnoreUnreadFields, void initClientN(const bool isthinClient, bool isPdxIgnoreUnreadFields, bool isPdxReadSerialized = false, - const PropertiesPtr& configPtr = NULLPTR) { + const PropertiesPtr& configPtr = nullptr) { LOGINFO("isPdxIgnoreUnreadFields = %d ", isPdxIgnoreUnreadFields); if (cacheHelper == NULL) { cacheHelper = new CacheHelper(isthinClient, isPdxIgnoreUnreadFields, @@ -105,7 +105,7 @@ void initClientN(const bool isthinClient, bool isPdxIgnoreUnreadFields, void stepOneN(bool isPdxIgnoreUnreadFields = false, bool isPdxReadSerialized = false, - PropertiesPtr config = NULLPTR) { + PropertiesPtr config = nullptr) { try { // Serializable::registerType(Position::createDeserializable); // Serializable::registerType(Portfolio::createDeserializable); @@ -126,23 +126,23 @@ void stepOneN(bool isPdxIgnoreUnreadFields = false, DUNIT_TASK_DEFINITION(CLIENT1, StepOnePoolLoc1) { LOG("Starting Step One with Pool + Locator lists"); - stepOneN(false, true, NULLPTR); + stepOneN(false, true, nullptr); } END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, StepTwoPoolLoc1) { LOG("Starting Step Two with Pool + Locator"); - stepOneN(false, true, NULLPTR); + stepOneN(false, true, nullptr); } END_TASK_DEFINITION /////////////// void initClient1WithClientName(const bool isthinClient, - const PropertiesPtr& configPtr = NULLPTR) { + const PropertiesPtr& configPtr = nullptr) { if (cacheHelper == NULL) { PropertiesPtr config = configPtr; - if (config == NULLPTR) { + if (config == nullptr) { config = Properties::create(); } config->insert("name", "Client-1"); @@ -152,10 +152,10 @@ void initClient1WithClientName(const bool isthinClient, } void initClient2WithClientName(const bool isthinClient, - const PropertiesPtr& configPtr = NULLPTR) { + const PropertiesPtr& configPtr = nullptr) { if (cacheHelper == NULL) { PropertiesPtr config = configPtr; - if (config == NULLPTR) { + if (config == nullptr) { config = Properties::create(); } config->insert("name", "Client-2"); @@ -186,7 +186,7 @@ void stepOneForClient2(bool isPdxIgnoreUnreadFields = false) { LOG("StepOne complete."); } void stepOne(bool isPdxIgnoreUnreadFields = false, - PropertiesPtr config = NULLPTR) { + PropertiesPtr config = nullptr) { try { // Serializable::registerType(Position::createDeserializable); // Serializable::registerType(Portfolio::createDeserializable); @@ -385,8 +385,7 @@ END_TASK_DEFINITION void checkPdxInstanceToStringAtServer(RegionPtr regionPtr) { CacheableKeyPtr keyport = CacheableKey::create("success"); - CacheableBooleanPtr boolPtr = - dynCast(regionPtr->get(keyport)); + auto boolPtr = std::dynamic_pointer_cast(regionPtr->get(keyport)); bool val = boolPtr->value(); // TODO::Enable asser and disable LOGINFO ASSERT(val == true, "checkPdxInstanceToStringAtServer: Val should be true"); @@ -414,12 +413,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, testPdxWriterAPIsWithInvalidArgs) // Put operation CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::InvalidPdxUsage()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); // Check the exception count:: expected is 41. - expectedExceptionCount = (dynCast(pdxobj)) - ->gettoDataExceptionCount(); + expectedExceptionCount = + (std::dynamic_pointer_cast(pdxobj)) + ->gettoDataExceptionCount(); // LOGINFO("TASK::testPdxWriterAPIsWithInvalidArgs:: toData ExceptionCount // :: // %d ", expectedExceptionCount); @@ -429,7 +429,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, testPdxWriterAPIsWithInvalidArgs) // Get Operation and check fromDataExceptionCount, Expected is 41. PdxTests::InvalidPdxUsagePtr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast( + regPtr0->get(keyport)); // LOGINFO("TASK::testPdxWriterAPIsWithInvalidArgs:: fromData ExceptionCOunt // :: %d ", obj2->getfromDataExceptionCount()); expectedExceptionCount = obj2->getfromDataExceptionCount(); @@ -460,7 +461,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, testPdxReaderAPIsWithInvalidArgs) // Get Operation. Check fromDataExceptionCount. Expected is 41. CacheableKeyPtr keyport1 = CacheableKey::create(1); PdxTests::InvalidPdxUsagePtr obj1 = - dynCast(regPtr0->get(keyport1)); + std::dynamic_pointer_cast( + regPtr0->get(keyport1)); // Check the exception count:: expected is 41. // LOGINFO("TASK::testPdxReaderAPIsWithInvalidArgs:: fromDataExceptionCount @@ -488,18 +490,18 @@ DUNIT_TASK_DEFINITION(CLIENT1, testPutWithMultilevelInheritance) // Put operation CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::Child()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); LOGINFO("TASK::testPutWithMultilevelInheritance:: Put successful"); // Get Operation and check fromDataExceptionCount, Expected is 41. PdxTests::ChildPtr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); // LOGINFO("Task: testPutWithMultilevelInheritance: got members :: %d %d %d // %d // %d %d ", obj2->getMember_a(), obj2->getMember_b(), obj2->getMember_c(), // obj2->getMember_d(), obj2->getMember_e(), obj2->getMember_f()); - bool isEqual = (dynCast(pdxobj))->equals(obj2); + bool isEqual = (std::dynamic_pointer_cast(pdxobj))->equals(obj2); LOGINFO("testPutWithMultilevelInheritance:.. isEqual = %d", isEqual); ASSERT(isEqual == true, "Objects of type class Child should be equal"); @@ -519,10 +521,10 @@ DUNIT_TASK_DEFINITION(CLIENT2, testGetWithMultilevelInheritance) CacheableKeyPtr keyport1 = CacheableKey::create(1); PdxTests::ChildPtr obj1 = - dynCast(regPtr0->get(keyport1)); + std::dynamic_pointer_cast(regPtr0->get(keyport1)); - CacheablePtr pdxobj(new PdxTests::Child()); - bool isEqual = (dynCast(pdxobj))->equals(obj1); + auto pdxobj = std::make_shared(); + bool isEqual = (std::dynamic_pointer_cast(pdxobj))->equals(obj1); LOGINFO("testPutWithMultilevelInheritance:.. isEqual = %d", isEqual); ASSERT(isEqual == true, "Objects of type class Child should be equal"); // LOGINFO("Task: testGetWithMultilevelInheritance: got members :: %d %d %d @@ -544,19 +546,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, JavaPutGet1) CacheableInt32Ptr valPtr = CacheableInt32::create(123); regPtr0->put(keyport, valPtr); - CacheableInt32Ptr getVal = - dynCast(regPtr0->get(keyport)); + auto getVal = std::dynamic_pointer_cast(regPtr0->get(keyport)); - CacheableBooleanPtr boolPtr = - dynCast(regPtr0->get("success")); + auto boolPtr = std::dynamic_pointer_cast(regPtr0->get("success")); - bool isEqual = boolPtr.ptr()->value(); + bool isEqual = boolPtr.get()->value(); ASSERT(isEqual == true, "Task JavaPutGet:Objects of type PdxType should be equal"); LOGINFO("Task:JavaPutGet PDX-ON read-serialized = %d", cacheHelper->getCache()->getPdxReadSerialized()); - PdxInstancePtr jsonDoc = dynCast(regPtr0->get("jsondoc1")); + auto jsonDoc = std::dynamic_pointer_cast(regPtr0->get("jsondoc1")); CacheableStringPtr toString = jsonDoc->toString(); LOGINFO("Task:JavaPutGet: Result = %s ", toString->asChar()); /* @@ -570,9 +570,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, JavaPutGet1) jsonDoc->getField("lastName", &stringVal1); */ - CacheablePtr object2 = NULLPTR; + CacheablePtr object2 = nullptr; jsonDoc->getField("kids", object2); - CacheableLinkedListPtr listPtr = dynCast(object2); + auto listPtr = std::dynamic_pointer_cast(object2); LOGINFO("Task:JavaPutGet: list size = %d", listPtr->size()); CacheableLinkedListPtr m_linkedlist = CacheableLinkedList::create(); @@ -608,29 +608,28 @@ DUNIT_TASK_DEFINITION(CLIENT1, JavaPutGet) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxType()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); PdxTests::PdxTypePtr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); - CacheableBooleanPtr boolPtr = - dynCast(regPtr0->get("success")); - bool isEqual = boolPtr.ptr()->value(); + auto boolPtr = std::dynamic_pointer_cast(regPtr0->get("success")); + bool isEqual = boolPtr.get()->value(); LOGDEBUG("Task:JavaPutGet: isEqual = %d", isEqual); ASSERT(isEqual == true, "Task JavaPutGet:Objects of type PdxType should be equal"); /* LOGINFO("NILKATH JavaPutGet new test."); - dynamic_cast(cacheHelper->getCache().ptr())->setPdxReadSerialized(true); + dynamic_cast(cacheHelper->getCache().get())->setPdxReadSerialized(true); LOGINFO("NILKATH JavaPutGet PDX-ON read-serialized = %d", cacheHelper->getCache()->getPdxReadSerialized()); - PdxInstancePtr jsonDoc = dynCast(regPtr0->get("jsondoc1")); + auto jsonDoc = std::dynamic_pointer_cast(regPtr0->get("jsondoc1")); int age = 0; jsonDoc->getField("age", age); LOGINFO("NILKATH:: Task:JavaPutGet: age = %d", age); - dynamic_cast(cacheHelper->getCache().ptr())->setPdxReadSerialized(false); + dynamic_cast(cacheHelper->getCache().get())->setPdxReadSerialized(false); LOGINFO("NILKATH JavaPutGet PDX-OFF read-serialized = %d", cacheHelper->getCache()->getPdxReadSerialized()); */ @@ -653,15 +652,15 @@ DUNIT_TASK_DEFINITION(CLIENT2, JavaGet) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport1 = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxType()); + auto pdxobj = std::make_shared(); LOGDEBUG("JavaGet-2 Line_314"); PdxTests::PdxTypePtr obj1 = - dynCast(regPtr0->get(keyport1)); + std::dynamic_pointer_cast(regPtr0->get(keyport1)); LOGDEBUG("JavaGet-3 Line_316"); CacheableKeyPtr keyport2 = CacheableKey::create("putFromjava"); LOGDEBUG("JavaGet-4 Line_316"); PdxTests::PdxTypePtr obj2 = - dynCast(regPtr0->get(keyport2)); + std::dynamic_pointer_cast(regPtr0->get(keyport2)); LOGDEBUG("JavaGet-5 Line_320"); } END_TASK_DEFINITION @@ -678,11 +677,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, putAtVersionTwoR21) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesR2V2Ptr np(new PdxTypesR2V2()); + auto np = std::make_shared(); regPtr0->put(keyport, np); - PdxTypesR2V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("putAtVersionTwoR21:.. isEqual = %d", isEqual); @@ -704,9 +703,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOneR22) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesV1R2Ptr np(new PdxTypesV1R2()); + auto np = std::make_shared(); - PdxTypesV1R2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("getPutAtVersionOneR22:.. isEqual = %d", isEqual); @@ -724,9 +723,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwoR23) CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesR2V2Ptr np(new PdxTypesR2V2()); + auto np = std::make_shared(); - PdxTypesR2V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("getPutAtVersionTwoR23:.. isEqual = %d", isEqual); @@ -743,9 +742,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOneR24) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesV1R2Ptr np(new PdxTypesV1R2()); + auto np = std::make_shared(); - PdxTypesV1R2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("getPutAtVersionOneR24:.. isEqual = %d", isEqual); @@ -768,11 +767,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, putAtVersionOne31) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType3V1Ptr np(new PdxType3V1()); + auto np = std::make_shared(); regPtr0->put(keyport, np); - PdxType3V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:putAtVersionOne31: isEqual = %d", isEqual); @@ -791,11 +790,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo32) } RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes3V2Ptr np(new PdxTypes3V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes3V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionTwo32.. isEqual = %d", isEqual); ASSERT( @@ -811,9 +810,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne33) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType3V1Ptr np(new PdxType3V1()); + auto np = std::make_shared(); - PdxType3V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("getPutAtVersionOne33:.. isEqual = %d", isEqual); @@ -829,11 +828,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo34) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes3V2Ptr np(new PdxTypes3V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes3V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionTwo34: isEqual = %d", isEqual); @@ -855,11 +854,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, putAtVersionOne21) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType2V1Ptr np(new PdxType2V1()); + auto np = std::make_shared(); regPtr0->put(keyport, np); - PdxType2V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:putAtVersionOne21:.. isEqual = %d", isEqual); @@ -878,11 +877,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo22) } RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes2V2Ptr np(new PdxTypes2V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes2V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionTwo22.. isEqual = %d", isEqual); ASSERT( @@ -897,11 +896,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne23) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxType2V1Ptr np(new PdxType2V1()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType2V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionOne23: isEqual = %d", isEqual); @@ -916,10 +915,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo24) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes2V2Ptr np(new PdxTypes2V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes2V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionTwo24.. isEqual = %d", isEqual); @@ -942,12 +941,12 @@ DUNIT_TASK_DEFINITION(CLIENT1, putAtVersionOne11) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTests::PdxType1V1Ptr np(new PdxTests::PdxType1V1()); + auto np = std::make_shared(); regPtr0->put(keyport, np); PdxTests::PdxType1V1Ptr pRet = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:putAtVersionOne11:.. isEqual = %d", isEqual); @@ -971,11 +970,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, putAtVersionTwo1) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesR1V2Ptr np(new PdxTypesR1V2()); + auto np = std::make_shared(); regPtr0->put(keyport, np); - PdxTypesR1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:putAtVersionTwo1:.. isEqual = %d", isEqual); @@ -995,11 +994,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne2) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesV1R1Ptr np(new PdxTypesV1R1()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesV1R1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionOne2:.. isEqual = %d", isEqual); @@ -1014,11 +1013,11 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo3) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesR1V2Ptr np(new PdxTypesR1V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesR1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionTwo3.. isEqual = %d", isEqual); ASSERT( @@ -1032,10 +1031,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne4) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesV1R1Ptr np(new PdxTypesV1R1()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesV1R1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("getPutAtVersionOne4: isEqual = %d", isEqual); @@ -1050,12 +1049,12 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo5) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesR1V2Ptr np(new PdxTypesR1V2()); + auto np = std::make_shared(); // GET CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesR1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getPutAtVersionTwo5.. isEqual = %d", isEqual); @@ -1070,10 +1069,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne6) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesV1R1Ptr np(new PdxTypesV1R1()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesV1R1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task getPutAtVersionOne6:.. isEqual = %d", isEqual); @@ -1096,12 +1095,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, putV2PdxUI) // PdxTests::PdxTypesIgnoreUnreadFieldsV2::reset(false); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesIgnoreUnreadFieldsV2Ptr np(new PdxTypesIgnoreUnreadFieldsV2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); regPtr0->put(keyport, np); - PdxTypesIgnoreUnreadFieldsV2Ptr pRet = - dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:putV2PdxUI:.. isEqual = %d", isEqual); @@ -1125,8 +1123,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, putV1PdxUI) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesIgnoreUnreadFieldsV1Ptr pRet = - dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); regPtr0->put(keyport, pRet); } END_TASK_DEFINITION @@ -1134,11 +1131,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getV2PdxUI) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypesIgnoreUnreadFieldsV2Ptr np(new PdxTypesIgnoreUnreadFieldsV2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypesIgnoreUnreadFieldsV2Ptr pRet = - dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("Task:getV2PdxUI:.. isEqual = %d", isEqual); @@ -1159,11 +1155,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo12) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes1V2Ptr np(new PdxTypes1V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionTwo12:.. isEqual = %d", isEqual); @@ -1178,11 +1174,11 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne13) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxType1V1Ptr np(new PdxType1V1()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType1V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionOne13:221.. isEqual = %d", isEqual); @@ -1198,10 +1194,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo14) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes1V2Ptr np(new PdxTypes1V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionTwo14:241.. isEqual = %d", isEqual); @@ -1217,12 +1213,12 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, getPutAtVersionOne15) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxType1V1Ptr np(new PdxType1V1()); + auto np = std::make_shared(); // GET CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType1V1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionOne15:784.. isEqual = %d", isEqual); @@ -1249,10 +1245,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, getPutAtVersionTwo16) { RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes1V2Ptr np(new PdxTypes1V2()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes1V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); bool isEqual = np->equals(pRet); LOGDEBUG("NIL:getPutAtVersionTwo14:.. isEqual = %d", isEqual); @@ -1286,13 +1282,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, Puts2) CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxTypes1()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); CacheableKeyPtr keyport2 = CacheableKey::create(2); - CacheablePtr pdxobj2(new PdxTests::PdxTypes2()); + auto pdxobj2 = std::make_shared(); regPtr0->put(keyport2, pdxobj2); @@ -1314,7 +1310,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, forCleanup) CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxTypes1()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); } catch (...) { @@ -1330,13 +1326,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, Puts22) CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxTypes1()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); CacheableKeyPtr keyport2 = CacheableKey::create(2); - CacheablePtr pdxobj2(new PdxTests::PdxTypes2()); + auto pdxobj2 = std::make_shared(); regPtr0->put(keyport2, pdxobj2); @@ -1362,7 +1358,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, Get2) CacheableKeyPtr keyport = CacheableKey::create(2); PdxTests::PdxTypes2Ptr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); LOG("Get2 complete.\n"); } @@ -1386,19 +1382,19 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGet) CacheableKeyPtr keyport = CacheableKey::create(1); - CacheablePtr pdxobj(new PdxTests::PdxType()); + auto pdxobj = std::make_shared(); regPtr0->put(keyport, pdxobj); PdxTests::PdxTypePtr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); checkPdxInstanceToStringAtServer(regPtr0); ASSERT(cacheHelper->getCache()->getPdxReadSerialized() == false, "Pdx read serialized property should be false."); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1444,14 +1440,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyNestedPdxInGet) // ignore exception } - NestedPdxPtr p1(new NestedPdx()); + auto p1 = std::make_shared(); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); regPtr0->put(keyport, p1); - NestedPdxPtr obj2 = dynCast(regPtr0->get(keyport)); + auto obj2 = std::dynamic_pointer_cast(regPtr0->get(keyport)); ASSERT(obj2->equals(p1) == true, "Nested pdx objects should be equal"); @@ -1482,10 +1478,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutMixedVersionNestedPdx) // ignore exception } - LOG("MixedVersionNestedPdxPtr p1(new MixedVersionNestedPdx()); "); - MixedVersionNestedPdxPtr p1(new MixedVersionNestedPdx()); - MixedVersionNestedPdxPtr p2(new MixedVersionNestedPdx()); - MixedVersionNestedPdxPtr p3(new MixedVersionNestedPdx()); + LOG("auto p1 = std::make_shared(); "); + auto p1 = std::make_shared(); + auto p2 = std::make_shared(); + auto p3 = std::make_shared(); LOG("RegionPtr regPtr0 = getHelper()->getRegion(\"DistRegionAck\");"); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); @@ -1565,14 +1561,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGFSInGet) } RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxInsideIGeodeSerializablePtr np(new PdxInsideIGeodeSerializable()); + auto np = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); regPtr0->put(keyport, np); // GET - PdxInsideIGeodeSerializablePtr pRet = - dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); ASSERT( pRet->equals(np) == true, "TASK PutAndVerifyPdxInIGFSInGet: PdxInsideIGeodeSerializable objects " @@ -1641,12 +1636,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyPdxInGFSGetOnly) } RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxInsideIGeodeSerializablePtr orig(new PdxInsideIGeodeSerializable()); + auto orig = std::make_shared(); // GET CacheableKeyPtr keyport = CacheableKey::create(1); - PdxInsideIGeodeSerializablePtr pRet = - dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); ASSERT(pRet->equals(orig) == true, "TASK:VerifyPdxInIGFSGetOnly, PdxInsideIGeodeSerializable objects " "should " @@ -1677,19 +1671,16 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyMixedVersionNestedGetOnly) // ignore exception } - MixedVersionNestedPdxPtr p1(new MixedVersionNestedPdx()); + auto p1 = std::make_shared(); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport1 = CacheableKey::create(1); CacheableKeyPtr keyport2 = CacheableKey::create(2); CacheableKeyPtr keyport3 = CacheableKey::create(3); - MixedVersionNestedPdxPtr obj1 = - dynCast(regPtr0->get(keyport1)); - MixedVersionNestedPdxPtr obj2 = - dynCast(regPtr0->get(keyport2)); - MixedVersionNestedPdxPtr obj3 = - dynCast(regPtr0->get(keyport3)); + auto obj1 = std::dynamic_pointer_cast(regPtr0->get(keyport1)); + auto obj2 = std::dynamic_pointer_cast(regPtr0->get(keyport2)); + auto obj3 = std::dynamic_pointer_cast(regPtr0->get(keyport3)); ASSERT(obj1->equals(p1) == true, "Nested pdx objects should be equal"); @@ -1719,12 +1710,12 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyNestedGetOnly) // ignore exception } - NestedPdxPtr p1(new NestedPdx()); + auto p1 = std::make_shared(); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - NestedPdxPtr obj2 = dynCast(regPtr0->get(keyport)); + auto obj2 = std::dynamic_pointer_cast(regPtr0->get(keyport)); ASSERT(obj2->equals(p1) == true, "Nested pdx objects should be equal"); @@ -1750,11 +1741,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyGetOnly) CacheableKeyPtr keyport = CacheableKey::create(1); PdxTests::PdxTypePtr obj2 = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1844,17 +1835,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); bool flag = false; { - PdxTypes1Ptr p1(new PdxTypes1()); + auto p1 = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(11); regPtr0->put(keyport, p1); - PdxTypes1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); flag = p1->equals(pRet); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes1 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1879,17 +1870,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes2Ptr p2(new PdxTypes2()); + auto p2 = std::make_shared(); CacheableKeyPtr keyport2 = CacheableKey::create(12); regPtr0->put(keyport2, p2); - PdxTypes2Ptr pRet2 = dynCast(regPtr0->get(keyport2)); + auto pRet2 = std::dynamic_pointer_cast(regPtr0->get(keyport2)); flag = p2->equals(pRet2); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes2 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1914,17 +1905,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes3Ptr p3(new PdxTypes3()); + auto p3 = std::make_shared(); CacheableKeyPtr keyport3 = CacheableKey::create(13); regPtr0->put(keyport3, p3); - PdxTypes3Ptr pRet3 = dynCast(regPtr0->get(keyport3)); + auto pRet3 = std::dynamic_pointer_cast(regPtr0->get(keyport3)); flag = p3->equals(pRet3); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes3 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1949,17 +1940,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes4Ptr p4(new PdxTypes4()); + auto p4 = std::make_shared(); CacheableKeyPtr keyport4 = CacheableKey::create(14); regPtr0->put(keyport4, p4); - PdxTypes4Ptr pRet4 = dynCast(regPtr0->get(keyport4)); + auto pRet4 = std::dynamic_pointer_cast(regPtr0->get(keyport4)); flag = p4->equals(pRet4); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes4 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -1984,17 +1975,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes5Ptr p5(new PdxTypes5()); + auto p5 = std::make_shared(); CacheableKeyPtr keyport5 = CacheableKey::create(15); regPtr0->put(keyport5, p5); - PdxTypes5Ptr pRet5 = dynCast(regPtr0->get(keyport5)); + auto pRet5 = std::dynamic_pointer_cast(regPtr0->get(keyport5)); flag = p5->equals(pRet5); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes5 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2019,17 +2010,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes6Ptr p6(new PdxTypes6()); + auto p6 = std::make_shared(); CacheableKeyPtr keyport6 = CacheableKey::create(16); regPtr0->put(keyport6, p6); - PdxTypes6Ptr pRet6 = dynCast(regPtr0->get(keyport6)); + auto pRet6 = std::dynamic_pointer_cast(regPtr0->get(keyport6)); flag = p6->equals(pRet6); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes6 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2054,17 +2045,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes7Ptr p7(new PdxTypes7()); + auto p7 = std::make_shared(); CacheableKeyPtr keyport7 = CacheableKey::create(17); regPtr0->put(keyport7, p7); - PdxTypes7Ptr pRet7 = dynCast(regPtr0->get(keyport7)); + auto pRet7 = std::dynamic_pointer_cast(regPtr0->get(keyport7)); flag = p7->equals(pRet7); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes7 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2089,17 +2080,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes8Ptr p8(new PdxTypes8()); + auto p8 = std::make_shared(); CacheableKeyPtr keyport8 = CacheableKey::create(18); regPtr0->put(keyport8, p8); - PdxTypes8Ptr pRet8 = dynCast(regPtr0->get(keyport8)); + auto pRet8 = std::dynamic_pointer_cast(regPtr0->get(keyport8)); flag = p8->equals(pRet8); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes8 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2124,17 +2115,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes9Ptr p9(new PdxTypes9()); + auto p9 = std::make_shared(); CacheableKeyPtr keyport9 = CacheableKey::create(19); regPtr0->put(keyport9, p9); - PdxTypes9Ptr pRet9 = dynCast(regPtr0->get(keyport9)); + auto pRet9 = std::dynamic_pointer_cast(regPtr0->get(keyport9)); flag = p9->equals(pRet9); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes9 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2159,17 +2150,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyVariousPdxTypes) } { - PdxTypes10Ptr p10(new PdxTypes10()); + auto p10 = std::make_shared(); CacheableKeyPtr keyport10 = CacheableKey::create(20); regPtr0->put(keyport10, p10); - PdxTypes10Ptr pRet10 = dynCast(regPtr0->get(keyport10)); + auto pRet10 = std::dynamic_pointer_cast(regPtr0->get(keyport10)); flag = p10->equals(pRet10); LOGDEBUG("PutAndVerifyVariousPdxTypes:.. flag = %d", flag); ASSERT(flag == true, "Objects of type PdxTypes10 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2212,19 +2203,18 @@ DUNIT_TASK_DEFINITION(CLIENT1, generateJavaPdxType) ResultCollectorPtr collector = funcExec->withArgs(args) ->withFilter(routingObj) ->execute("ComparePdxTypes", true); - ASSERT(collector != NULLPTR, "onRegion collector NULL"); + ASSERT(collector != nullptr, "onRegion collector NULL"); CacheableVectorPtr result = collector->getResult(); LOGINFO("NIL:: testTCPDXTests: result->size = %d ", result->size()); - if (result == NULLPTR) { + if (result == nullptr) { ASSERT(false, "echo String : result is NULL"); } else { // bool gotResult = false; for (int i = 0; i < result->size(); i++) { try { - CacheableBooleanPtr boolValue = - dynCast(result->operator[](i)); + auto boolValue = std::dynamic_pointer_cast(result->operator[](i)); LOGINFO("NIL:: boolValue is %d ", boolValue->value()); bool resultVal = boolValue->value(); ASSERT(resultVal == true, @@ -2242,9 +2232,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, generateJavaPdxType) LOG("exFuncNameSendException now casting to " "UserFunctionExecutionExceptionPtr for arrayList arguement " "exception."); - UserFunctionExecutionExceptionPtr uFEPtr = - dynCast(result->operator[](i)); - ASSERT(uFEPtr != NULLPTR, "uFEPtr exception is NULL"); + auto uFEPtr = std::dynamic_pointer_cast(result->operator[](i)); + ASSERT(uFEPtr != nullptr, "uFEPtr exception is NULL"); LOGINFO("Done casting to uFEPtr"); LOGINFO("Read expected uFEPtr exception %s ", uFEPtr->getMessage()->asChar()); @@ -2318,43 +2307,43 @@ DUNIT_TASK_DEFINITION(CLIENT1, putAllPdxTypes) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); - PdxTypes1Ptr p1(new PdxTypes1()); + auto p1 = std::make_shared(); CacheableKeyPtr keyport1 = CacheableKey::create(p1->getClassName()); regPtr0->put(keyport1, p1); - PdxTypes2Ptr p2(new PdxTypes2()); + auto p2 = std::make_shared(); CacheableKeyPtr keyport2 = CacheableKey::create(p2->getClassName()); regPtr0->put(keyport2, p2); - PdxTypes3Ptr p3(new PdxTypes3()); + auto p3 = std::make_shared(); CacheableKeyPtr keyport3 = CacheableKey::create(p3->getClassName()); regPtr0->put(keyport3, p3); - PdxTypes4Ptr p4(new PdxTypes4()); + auto p4 = std::make_shared(); CacheableKeyPtr keyport4 = CacheableKey::create(p4->getClassName()); regPtr0->put(keyport4, p4); - PdxTypes5Ptr p5(new PdxTypes5()); + auto p5 = std::make_shared(); CacheableKeyPtr keyport5 = CacheableKey::create(p5->getClassName()); regPtr0->put(keyport5, p5); - PdxTypes6Ptr p6(new PdxTypes6()); + auto p6 = std::make_shared(); CacheableKeyPtr keyport6 = CacheableKey::create(p6->getClassName()); regPtr0->put(keyport6, p6); - PdxTypes7Ptr p7(new PdxTypes7()); + auto p7 = std::make_shared(); CacheableKeyPtr keyport7 = CacheableKey::create(p7->getClassName()); regPtr0->put(keyport7, p7); - PdxTypes8Ptr p8(new PdxTypes8()); + auto p8 = std::make_shared(); CacheableKeyPtr keyport8 = CacheableKey::create(p8->getClassName()); regPtr0->put(keyport8, p8); - PdxTypes9Ptr p9(new PdxTypes9()); + auto p9 = std::make_shared(); CacheableKeyPtr keyport9 = CacheableKey::create(p9->getClassName()); regPtr0->put(keyport9, p9); - PdxTypes10Ptr p10(new PdxTypes10()); + auto p10 = std::make_shared(); CacheableKeyPtr keyport10 = CacheableKey::create(p10->getClassName()); regPtr0->put(keyport10, p10); @@ -2376,19 +2365,18 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyDotNetPdxTypes) ResultCollectorPtr collector = funcExec->withArgs(args) ->withFilter(routingObj) ->execute("ComparePdxTypes", true); - ASSERT(collector != NULLPTR, "onRegion collector NULL"); + ASSERT(collector != nullptr, "onRegion collector NULL"); CacheableVectorPtr result = collector->getResult(); LOGINFO("NIL:: testTCPDXTests:verifyDotNetPdxTypes result->size = %d ", result->size()); - if (result == NULLPTR) { + if (result == nullptr) { ASSERT(false, "echo String : result is NULL"); } else { bool gotResult = false; for (int i = 0; i < result->size(); i++) { try { - CacheableBooleanPtr boolValue = - dynCast(result->operator[](i)); + auto boolValue = std::dynamic_pointer_cast(result->operator[](i)); LOGINFO("NIL::verifyDotNetPdxTypes boolValue is %d ", boolValue->value()); bool resultVal = boolValue->value(); @@ -2407,9 +2395,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyDotNetPdxTypes) LOG("exFuncNameSendException now casting to " "UserFunctionExecutionExceptionPtr for arrayList arguement " "exception."); - UserFunctionExecutionExceptionPtr uFEPtr = - dynCast(result->operator[](i)); - ASSERT(uFEPtr != NULLPTR, "uFEPtr exception is NULL"); + auto uFEPtr = std::dynamic_pointer_cast(result->operator[](i)); + ASSERT(uFEPtr != nullptr, "uFEPtr exception is NULL"); LOGINFO("Done casting to uFEPtr"); LOGINFO("Read expected uFEPtr exception %s ", uFEPtr->getMessage()->asChar()); @@ -2438,7 +2425,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, client1PutsV1Object) PdxTests::PdxType3V1::reset(false); RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); CacheableKeyPtr keyport = CacheableKey::create(1); - PdxType3V1Ptr np(new PdxType3V1()); + auto np = std::make_shared(); regPtr0->put(keyport, np); } @@ -2457,10 +2444,10 @@ DUNIT_TASK_DEFINITION(CLIENT2, client2GetsV1ObjectAndPutsV2Object) // get v1 object CacheableKeyPtr keyport = CacheableKey::create(1); - PdxTypes3V2Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); // now put v2 object - PdxTypes3V2Ptr np(new PdxTypes3V2()); + auto np = std::make_shared(); regPtr0->put(keyport, np); LOGDEBUG("Task:client2GetsV1ObjectAndPutsV2Object Done successfully "); @@ -2478,19 +2465,18 @@ DUNIT_TASK_DEFINITION(CLIENT3, client3GetsV2Object) ExecutionPtr funcExec = FunctionService::onRegion(regPtr0); ResultCollectorPtr collector = funcExec->execute("IterateRegion", true); - ASSERT(collector != NULLPTR, "onRegion collector NULL"); + ASSERT(collector != nullptr, "onRegion collector NULL"); CacheableVectorPtr result = collector->getResult(); LOGINFO("NIL:: testTCPDXTests:verifyDotNetPdxTypes result->size = %d ", result->size()); - if (result == NULLPTR) { + if (result == nullptr) { ASSERT(false, "echo String : result is NULL"); } else { bool gotResult = false; for (int i = 0; i < result->size(); i++) { try { - CacheableBooleanPtr boolValue = - dynCast(result->operator[](i)); + auto boolValue = std::dynamic_pointer_cast(result->operator[](i)); LOGINFO("NIL::verifyDotNetPdxTypes boolValue is %d ", boolValue->value()); bool resultVal = boolValue->value(); @@ -2509,9 +2495,8 @@ DUNIT_TASK_DEFINITION(CLIENT3, client3GetsV2Object) LOG("exFuncNameSendException now casting to " "UserFunctionExecutionExceptionPtr for arrayList arguement " "exception."); - UserFunctionExecutionExceptionPtr uFEPtr = - dynCast(result->operator[](i)); - ASSERT(uFEPtr != NULLPTR, "uFEPtr exception is NULL"); + auto uFEPtr = std::dynamic_pointer_cast(result->operator[](i)); + ASSERT(uFEPtr != nullptr, "uFEPtr exception is NULL"); LOGINFO("Done casting to uFEPtr"); LOGINFO("Read expected uFEPtr exception %s ", uFEPtr->getMessage()->asChar()); @@ -2586,9 +2571,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck"); bool flag = false; { - PdxTypes1Ptr p1(new PdxTypes1()); + auto p1 = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(11); - PdxTypes1Ptr pRet = dynCast(regPtr0->get(keyport)); + auto pRet = std::dynamic_pointer_cast(regPtr0->get(keyport)); flag = p1->equals(pRet); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2596,7 +2581,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes1 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2620,9 +2605,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes2Ptr p2(new PdxTypes2()); + auto p2 = std::make_shared(); CacheableKeyPtr keyport2 = CacheableKey::create(12); - PdxTypes2Ptr pRet2 = dynCast(regPtr0->get(keyport2)); + auto pRet2 = std::dynamic_pointer_cast(regPtr0->get(keyport2)); flag = p2->equals(pRet2); LOGDEBUG("VerifyVariousPdxGets:. flag = %d", flag); @@ -2630,7 +2615,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes2 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2654,9 +2639,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes3Ptr p3(new PdxTypes3()); + auto p3 = std::make_shared(); CacheableKeyPtr keyport3 = CacheableKey::create(13); - PdxTypes3Ptr pRet3 = dynCast(regPtr0->get(keyport3)); + auto pRet3 = std::dynamic_pointer_cast(regPtr0->get(keyport3)); flag = p3->equals(pRet3); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2664,7 +2649,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes3 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2688,9 +2673,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes4Ptr p4(new PdxTypes4()); + auto p4 = std::make_shared(); CacheableKeyPtr keyport4 = CacheableKey::create(14); - PdxTypes4Ptr pRet4 = dynCast(regPtr0->get(keyport4)); + auto pRet4 = std::dynamic_pointer_cast(regPtr0->get(keyport4)); flag = p4->equals(pRet4); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2698,7 +2683,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes4 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2722,9 +2707,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes5Ptr p5(new PdxTypes5()); + auto p5 = std::make_shared(); CacheableKeyPtr keyport5 = CacheableKey::create(15); - PdxTypes5Ptr pRet5 = dynCast(regPtr0->get(keyport5)); + auto pRet5 = std::dynamic_pointer_cast(regPtr0->get(keyport5)); flag = p5->equals(pRet5); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2732,7 +2717,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes5 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2756,9 +2741,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes6Ptr p6(new PdxTypes6()); + auto p6 = std::make_shared(); CacheableKeyPtr keyport6 = CacheableKey::create(16); - PdxTypes6Ptr pRet6 = dynCast(regPtr0->get(keyport6)); + auto pRet6 = std::dynamic_pointer_cast(regPtr0->get(keyport6)); flag = p6->equals(pRet6); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2766,7 +2751,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes6 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2790,9 +2775,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes7Ptr p7(new PdxTypes7()); + auto p7 = std::make_shared(); CacheableKeyPtr keyport7 = CacheableKey::create(17); - PdxTypes7Ptr pRet7 = dynCast(regPtr0->get(keyport7)); + auto pRet7 = std::dynamic_pointer_cast(regPtr0->get(keyport7)); flag = p7->equals(pRet7); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2800,7 +2785,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes7 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2824,9 +2809,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes8Ptr p8(new PdxTypes8()); + auto p8 = std::make_shared(); CacheableKeyPtr keyport8 = CacheableKey::create(18); - PdxTypes8Ptr pRet8 = dynCast(regPtr0->get(keyport8)); + auto pRet8 = std::dynamic_pointer_cast(regPtr0->get(keyport8)); flag = p8->equals(pRet8); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2834,7 +2819,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes8 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2858,9 +2843,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes9Ptr p9(new PdxTypes9()); + auto p9 = std::make_shared(); CacheableKeyPtr keyport9 = CacheableKey::create(19); - PdxTypes9Ptr pRet9 = dynCast(regPtr0->get(keyport9)); + auto pRet9 = std::dynamic_pointer_cast(regPtr0->get(keyport9)); flag = p9->equals(pRet9); LOGDEBUG("VerifyVariousPdxGets:. flag = %d", flag); @@ -2868,7 +2853,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes9 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2892,9 +2877,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) } { - PdxTypes10Ptr p10(new PdxTypes10()); + auto p10 = std::make_shared(); CacheableKeyPtr keyport10 = CacheableKey::create(20); - PdxTypes10Ptr pRet10 = dynCast(regPtr0->get(keyport10)); + auto pRet10 = std::dynamic_pointer_cast(regPtr0->get(keyport10)); flag = p10->equals(pRet10); LOGDEBUG("VerifyVariousPdxGets:.. flag = %d", flag); @@ -2902,7 +2887,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyVariousPdxGets) "VerifyVariousPdxGets:Objects of type PdxTypes10 should be equal"); checkPdxInstanceToStringAtServer(regPtr0); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -2938,7 +2923,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, putOperation) // RegionPtr testReg = getHelper()->getRegion("testregion"); CacheablePtr valuePtr1 = regPtr0->get("clientName1"); const char* clientName1 = - (dynCast(valuePtr1))->asChar(); + (std::dynamic_pointer_cast(valuePtr1))->asChar(); LOGINFO(" C1.putOperation Got ClientName1 = %s ", clientName1); ASSERT(strcmp(clientName1, "Client-1") == 0, "ClientName for Client-1 is not set"); @@ -2955,7 +2940,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, getOperation) // Verify Client Name for C2 CacheablePtr valuePtr2 = regPtr0->get("clientName2"); const char* clientName2 = - (dynCast(valuePtr2))->asChar(); + (std::dynamic_pointer_cast(valuePtr2))->asChar(); LOGINFO(" C2.getOperation Got ClientName2 = %s ", clientName2); ASSERT(strcmp(clientName2, "Client-2") == 0, "ClientName for Client-2 is not set"); @@ -2975,7 +2960,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, putCharTypes) LOG("PdxTests::CharTypes Registered Successfully...."); LOG("Trying to populate PDX objects.....\n"); - CacheablePtr pdxobj(new PdxTests::CharTypes()); + auto pdxobj = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); // PUT Operation @@ -3002,17 +2987,17 @@ DUNIT_TASK_DEFINITION(CLIENT2, getCharTypes) // ignore exception } - PdxTests::CharTypesPtr localPdxptr(new PdxTests::CharTypes()); + auto localPdxptr = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); LOG("Client-2 PdxTests::CharTypes GET OP Start...."); PdxTests::CharTypesPtr remotePdxptr = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); LOG("Client-2 PdxTests::CharTypes GET OP Done...."); - PdxTests::CharTypes* localPdx = localPdxptr.ptr(); + PdxTests::CharTypes* localPdx = localPdxptr.get(); PdxTests::CharTypes* remotePdx = - dynamic_cast(remotePdxptr.ptr()); + dynamic_cast(remotePdxptr.get()); LOGINFO("testThinClientPdxTests:StepFour before equal() check"); ASSERT(remotePdx->equals(*localPdx) == true, @@ -3050,7 +3035,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepThree) LOG("PdxClassV1 Registered Successfully...."); LOG("Trying to populate PDX objects.....\n"); - CacheablePtr pdxobj(new PdxTests::PdxType()); + auto pdxobj = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); // PUT Operation @@ -3086,7 +3071,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepThree) regPtr0->get(keyport); regPtr0->get(keyport2); - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -3171,8 +3156,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) // Get remote CacheableObjectArray on key 2 CacheableKeyPtr keyport2 = CacheableKey::create(2); LOGINFO("Client-2 PdxTests::PdxType GET OP Start...."); - CacheableObjectArrayPtr remoteCObjArray = - dynCast(regPtr0->get(keyport2)); + auto remoteCObjArray = std::dynamic_pointer_cast(regPtr0->get(keyport2)); LOGINFO( "Client-2 PdxTests::PdxType GET OP Done.. Received CObjeArray Size = " @@ -3185,8 +3169,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) // Compare local vs remote CacheableObjectArray elements. bool isEqual = true; for (int i = 0; i < remoteCObjArray->size(); i++) { - Address* rAddr1 = dynamic_cast(remoteCObjArray->at(i).ptr()); - Address* lAddr1 = dynamic_cast(m_localObjectArray->at(i).ptr()); + Address* rAddr1 = dynamic_cast(remoteCObjArray->at(i).get()); + Address* lAddr1 = dynamic_cast(m_localObjectArray->at(i).get()); LOGINFO("Remote Address:: %d th element AptNum=%d street=%s city=%s ", i, rAddr1->getAptNum(), rAddr1->getStreet(), rAddr1->getCity()); if (!rAddr1->equals(*lAddr1)) { @@ -3197,18 +3181,18 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) ASSERT(isEqual == true, "PdxTests StepFour: CacheableObjectArray elements are not matched"); - PdxTests::PdxTypePtr localPdxptr(new PdxTests::PdxType()); + auto localPdxptr = std::make_shared(); CacheableKeyPtr keyport = CacheableKey::create(1); LOG("Client-2 PdxTests::PdxType GET OP Start...."); PdxTests::PdxTypePtr remotePdxptr = - dynCast(regPtr0->get(keyport)); + std::dynamic_pointer_cast(regPtr0->get(keyport)); LOG("Client-2 PdxTests::PdxType GET OP Done...."); // - PdxTests::PdxType* localPdx = localPdxptr.ptr(); + PdxTests::PdxType* localPdx = localPdxptr.get(); PdxTests::PdxType* remotePdx = - dynamic_cast(remotePdxptr.ptr()); + dynamic_cast(remotePdxptr.get()); // ToDo open this equals check LOGINFO("testThinClientPdxTests:StepFour before equal() check"); @@ -3226,7 +3210,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) remotePdx->getArrayOfByteArrays()[1][1]); CacheableInt32* element = - dynamic_cast(remotePdx->getArrayList()->at(0).ptr()); + dynamic_cast(remotePdx->getArrayList()->at(0).get()); LOGINFO("GET OP Result_1233: Array List element Value =%d", element->value()); @@ -3235,8 +3219,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) for (CacheableHashTable::Iterator iter = remotePdx->getHashTable()->begin(); iter != remotePdx->getHashTable()->end(); ++iter) { - remoteKey = dynamic_cast(iter.first().ptr()); - remoteVal = dynamic_cast(iter.second().ptr()); + remoteKey = dynamic_cast(iter.first().get()); + remoteVal = dynamic_cast(iter.second().get()); LOGINFO("HashTable Key Val = %d", remoteKey->value()); LOGINFO("HashTable Val = %s", remoteVal->asChar()); //(*iter1).first.value(); @@ -3244,7 +3228,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) } // Now get values for key3 and 4 to asset against stats of this client - LocalRegion* lregPtr = (dynamic_cast(regPtr0.ptr())); + LocalRegion* lregPtr = (dynamic_cast(regPtr0.get())); LOGINFO("PdxSerializations = %d ", lregPtr->getCacheImpl()->m_cacheStats->getPdxSerializations()); LOGINFO("PdxDeSerializations = %d ", @@ -3257,10 +3241,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) CacheableKeyPtr keyport3 = CacheableKey::create(3); CacheableKeyPtr keyport4 = CacheableKey::create(4); - CacheableInt32Ptr int32Ptr = - dynCast(regPtr0->get(keyport3)); - CacheableInt64Ptr int64Ptr = - dynCast(regPtr0->get(keyport4)); + auto int32Ptr = std::dynamic_pointer_cast(regPtr0->get(keyport3)); + auto int64Ptr = std::dynamic_pointer_cast(regPtr0->get(keyport4)); ASSERT(int32Ptr->value() == lregPtr->getCacheImpl()->m_cacheStats->getPdxDeSerializations(), "Total pdxDeserializations should be equal to Total "