geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [15/23] geode-native git commit: GEODE-2741: Code cleanup to move to std::shared_ptr
Date Tue, 06 Jun 2017 17:56:41 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
index c0a5333..164308f 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionPrSHOP.cpp
@@ -66,9 +66,10 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
           "std::dynamic_pointer_cast<CacheableString>(resultList->operator[](" \
           "i))->asChar() "                                                     \
           "= %s ",                                                             \
-          buf, std::dynamic_pointer_cast<CacheableString>(                     \
-                   resultList->operator[](i))                                  \
-                   ->asChar());                                                \
+          buf,                                                                 \
+          std::dynamic_pointer_cast<CacheableString>(                          \
+              resultList->operator[](i))                                       \
+              ->asChar());                                                     \
       found = true;                                                            \
       break;                                                                   \
     }                                                                          \
@@ -88,9 +89,10 @@ char* FETimeOut = (char*)"FunctionExecutionTimeOut";
           "std::dynamic_pointer_cast<CacheableString>(resultList->operator[](" \
           "i))->asChar() "                                                     \
           "= %s ",                                                             \
-          buf, std::dynamic_pointer_cast<CacheableString>(                     \
-                   resultList->operator[](i))                                  \
-                   ->asChar());                                                \
+          buf,                                                                 \
+          std::dynamic_pointer_cast<CacheableString>(                          \
+              resultList->operator[](i))                                       \
+              ->asChar());                                                     \
       found = true;                                                            \
       break;                                                                   \
     }                                                                          \
@@ -220,7 +222,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(SERVER, StartS12)
   {
-    const char* lhp = NULL;
+    const char* lhp = nullptr;
     if (!isPoolWithEndpoint) lhp = locHostPort;
     if (isLocalServer) {
       CacheHelper::initServer(1, "func_cacheserver1_pool.xml", lhp);
@@ -233,11 +235,11 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(CLIENT1, StartC1)
   {
-    initClientWithPool(true, NULL, locHostPort, serverGroup, nullptr, 0, true,
-                       -1, -1, 60000, /*singlehop*/ true,
+    initClientWithPool(true, nullptr, locHostPort, serverGroup, nullptr, 0,
+                       true, -1, -1, 60000, /*singlehop*/ true,
                        /*threadLocal*/ true);
 
-    auto regPtr0 = createRegionAndAttachPool(poolRegNames[0], USE_ACK, NULL);
+    auto regPtr0 = createRegionAndAttachPool(poolRegNames[0], USE_ACK, nullptr);
     regPtr0->registerAllKeys();
 
     LOG("Clnt1Init complete.");
@@ -272,7 +274,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       // test data dependant function
       //     test get function with result
       auto exc = FunctionService::onRegion(regPtr0);
-      ASSERT(exc != nullptr, "onRegion Returned NULL");
+      ASSERT(exc != nullptr, "onRegion Returned nullptr");
       args = CacheableKey::create("echoString");
       CacheablePtr args1 = CacheableKey::create("echoBoolean");
       auto exe1 = exc->withArgs(args);
@@ -281,7 +283,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       auto resultList = CacheableVector::create();
       auto executeFunctionResult = exe1->execute(rjFuncName, 15)->getResult();
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "echo String : executeFunctionResult is NULL");
+        ASSERT(false, "echo String : executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -305,7 +307,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                                   ->execute(rjFuncName, 15)
                                   ->getResult();
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "echo String : executeFunctionResult is NULL");
+        ASSERT(false, "echo String : executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -322,7 +324,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                                   ->execute(rjFuncName, 15)
                                   ->getResult();
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "echo Boolean: executeFunctionResult is NULL");
+        ASSERT(false, "echo Boolean: executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo Boolean: result count = %d",
                 executeFunctionResult->size());
@@ -341,15 +343,15 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       /****
        **decomposed from above long expression:
       exc =  exc->withFilter(routingObj);
-      ASSERT(exc!=nullptr, "withFilter Returned NULL");
+      ASSERT(exc!=nullptr, "withFilter Returned nullptr");
       exc = exc->withArgs(args);
-      ASSERT(exc!=nullptr, "withArgs Returned NULL");
+      ASSERT(exc!=nullptr, "withArgs Returned nullptr");
       ResultCollectorPtr rc = exc->execute(getFuncName, getResult);
-      ASSERT(rc!=nullptr, "execute Returned NULL");
+      ASSERT(rc!=nullptr, "execute Returned nullptr");
       CacheableVectorPtr executeFunctionResult = rc->getResult();
       */
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "region get: executeFunctionResult is NULL");
+        ASSERT(false, "region get: executeFunctionResult is nullptr");
       } else {
         for (unsigned item = 0;
              item < static_cast<uint32_t>(executeFunctionResult->size());
@@ -402,7 +404,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       LOG(buf);
       if (executeFunctionResult == nullptr) {
         ASSERT(false,
-               "region get new collector: executeFunctionResult is NULL");
+               "region get new collector: executeFunctionResult is nullptr");
       } else {
         resultList->clear();
         for (unsigned item = 0;
@@ -451,7 +453,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                                   ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -515,16 +517,16 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       getResult = true;
 
       auto funcExec = FunctionService::onRegion(regPtr0);
-      ASSERT(funcExec != nullptr, "onRegion Returned NULL");
+      ASSERT(funcExec != nullptr, "onRegion Returned nullptr");
 
       auto collector = funcExec->withArgs(args)->withFilter(filter)->execute(
           exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onRegion collector NULL");
+      ASSERT(collector != nullptr, "onRegion collector nullptr");
 
       auto result = collector->getResult();
 
       if (result == nullptr) {
-        ASSERT(false, "echo String : result is NULL");
+        ASSERT(false, "echo String : result is nullptr");
       } else {
         for (int i = 0; i < result->size(); i++) {
           ASSERT(validateResultTypeIsUserFunctionExecutionException(
@@ -537,7 +539,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
 
       collector = funcExec->withArgs(arrList)->withFilter(filter)->execute(
           exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onRegion collector for arrList NULL");
+      ASSERT(collector != nullptr, "onRegion collector for arrList nullptr");
 
       result = collector->getResult();
       LOGINFO("result->size() = %d & arrList->size()  = %d ", result->size(),
@@ -559,7 +561,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       args = CacheableString::create("Multiple");
       collector = funcExec->withArgs(args)->withFilter(filter)->execute(
           exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onRegion collector for string NULL");
+      ASSERT(collector != nullptr, "onRegion collector for string nullptr");
       result = collector->getResult();
       LOGINFO("result->size() for Multiple String = %d ", result->size());
       ASSERT(result->size() == 1,
@@ -594,7 +596,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       ASSERT(1 == myRC1->getEndResultCount(), "end result count is not 1");
       ASSERT(1 == myRC1->getGetResultCount(), "get result count is not 1");
       if (result == nullptr) {
-        ASSERT(false, "region get new collector: result is NULL");
+        ASSERT(false, "region get new collector: result is nullptr");
       } else {
         LOGINFO("Region get new collector: result count = %d", result->size());
         ASSERT(1 == result->size(),
@@ -631,7 +633,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       executeFunctionResult =
           exc->withArgs(args)->execute(getFuncIName, getResult)->getResult();
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         resultList->clear();
         for (unsigned item = 0;
@@ -712,7 +714,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
               ->getResult();
       LOGINFO("FE on pdxObject done");
       if (executeFunctionResultPdx == nullptr) {
-        ASSERT(false, "get executeFunctionResultPdx is NULL");
+        ASSERT(false, "get executeFunctionResultPdx is nullptr");
       } else {
         LOGINFO("executeFunctionResultPdx size for PdxObject = %d ",
                 executeFunctionResultPdx->size());
@@ -734,10 +736,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
           sprintf(buf, "result[%d] is null\n", i);
           ASSERT(resultListPdx->operator[](i) != nullptr, buf);
           LOG("resultPdx item is not null");
-          LOGINFO("get result[%d]=%s", i, std::dynamic_pointer_cast<PdxTypes8>(
-                                              resultListPdx->operator[](i))
-                                              ->toString()
-                                              ->asChar());
+          LOGINFO(
+              "get result[%d]=%s", i,
+              std::dynamic_pointer_cast<PdxTypes8>(resultListPdx->operator[](i))
+                  ->toString()
+                  ->asChar());
           auto pdxObj2 = std::dynamic_pointer_cast<PdxTypes8>(
               resultListPdx->operator[](i));
           ASSERT(pdxobj->equals(pdxObj2) == true,
@@ -782,7 +785,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
               ->getResult();
       LOGINFO("FE on pdxObject done");
       if (executeFunctionResultPdxInstance == nullptr) {
-        ASSERT(false, "get executeFunctionResultPdxInstance is NULL");
+        ASSERT(false, "get executeFunctionResultPdxInstance is nullptr");
       } else {
         LOGINFO("executeFunctionResultPdxInstance size for PdxObject = %d ",
                 executeFunctionResultPdxInstance->size());
@@ -837,7 +840,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       // adding one more server, this should be return by locator and then
       // function should be executed on all the 3 servers
 
-      const char* lhp = NULL;
+      const char* lhp = nullptr;
       if (!isPoolWithEndpoint) lhp = locHostPort;
 
       if (isLocalServer) {
@@ -852,7 +855,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       executeFunctionResult =
           exc->withArgs(args)->execute(getFuncIName, getResult)->getResult();
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         resultList->clear();
         for (unsigned item = 0;
@@ -906,13 +909,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
 
       collector =
           funcExec->withArgs(args)->execute(exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onServers collector for bool NULL");
+      ASSERT(collector != nullptr, "onServers collector for bool nullptr");
 
       result = collector->getResult();
       ASSERT(result->size() == 3,
              "Should have got 3 exception strings for sendException.");
       if (result == nullptr) {
-        ASSERT(false, "echo String : result is NULL");
+        ASSERT(false, "echo String : result is nullptr");
       } else {
         for (int i = 0; i < result->size(); i++) {
           ASSERT(validateResultTypeIsUserFunctionExecutionException(
@@ -924,7 +927,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
 
       collector =
           funcExec->withArgs(arrList)->execute(exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onServers collector for arrList NULL");
+      ASSERT(collector != nullptr, "onServers collector for arrList nullptr");
 
       result = collector->getResult();
       ASSERT(result->size() == (arrList->size() + 1) * 3,
@@ -951,7 +954,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       args = CacheableString::create("Multiple");
       collector =
           funcExec->withArgs(args)->execute(exFuncNameSendException, 15);
-      ASSERT(collector != nullptr, "onServers collector for string NULL");
+      ASSERT(collector != nullptr, "onServers collector for string nullptr");
 
       result = collector->getResult();
       ASSERT(result->size() == 3,
@@ -982,7 +985,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       LOGINFO("end result count = %d", myRC2->getEndResultCount());
       LOGINFO("get result count = %d", myRC2->getGetResultCount());
       if (result == nullptr) {
-        ASSERT(false, "region get new collector: result is NULL");
+        ASSERT(false, "region get new collector: result is nullptr");
       } else {
         LOGINFO("Region get new collector: result count = %d", result->size());
         ASSERT(3 == result->size(),
@@ -1064,7 +1067,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                     ->execute(FETimeOut, 5000)
                     ->getResult();
       if (fe == nullptr) {
-        ASSERT(false, "functionResult is NULL");
+        ASSERT(false, "functionResult is nullptr");
       } else {
         sprintf(buf, "result count = %d", fe->size());
         LOG(buf);
@@ -1086,7 +1089,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                      ->execute(FETimeOut, 5000)
                      ->getResult();
       if (vec == nullptr) {
-        ASSERT(false, "functionResult is NULL");
+        ASSERT(false, "functionResult is nullptr");
       } else {
         sprintf(buf, "result count = %d", vec->size());
         LOG(buf);
@@ -1107,7 +1110,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                       ->execute(FETimeOut, 5000)
                       ->getResult();
       if (vecs == nullptr) {
-        ASSERT(false, "functionResult is NULL");
+        ASSERT(false, "functionResult is nullptr");
       } else {
         sprintf(buf, "result count = %d", vecs->size());
         LOG(buf);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
index 6220c9e..fa5fc77 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteFunctionThrowsException.cpp
@@ -174,7 +174,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(SERVER, StartS12)
   {
-    const char* lhp = NULL;
+    const char* lhp = nullptr;
     if (!isPoolWithEndpoint) lhp = locHostPort;
     if (isLocalServer) {
       CacheHelper::initServer(1, "func_cacheserver1_pool.xml", lhp);
@@ -188,14 +188,14 @@ END_TASK_DEFINITION
 DUNIT_TASK_DEFINITION(CLIENT1, StartC1)
   {
     // initClient(true);
-    initClientWithPool(true, NULL, locHostPort, serverGroup, nullptr, 0, true,
-                       -1, -1, 60000, /*singlehop*/ true,
+    initClientWithPool(true, nullptr, locHostPort, serverGroup, nullptr, 0,
+                       true, -1, -1, 60000, /*singlehop*/ true,
                        /*threadLocal*/ true);
-    // createPool(poolName, locHostPort,serverGroup, NULL, 0, true );
+    // createPool(poolName, locHostPort,serverGroup, nullptr, 0, true );
     // createRegionAndAttachPool(poolRegNames[0],USE_ACK, poolName);
 
     RegionPtr regPtr0 =
-        createRegionAndAttachPool(poolRegNames[0], USE_ACK, NULL);
+        createRegionAndAttachPool(poolRegNames[0], USE_ACK, nullptr);
     ;  // getHelper()->createRegion( poolRegNames[0], USE_ACK);
     regPtr0->registerAllKeys();
 
@@ -250,17 +250,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
     CacheablePtr args = CacheableBoolean::create(1);
 
     ExecutionPtr funcExec = FunctionService::onRegion(regPtr0);
-    ASSERT(funcExec != nullptr, "onRegion Returned NULL");
+    ASSERT(funcExec != nullptr, "onRegion Returned nullptr");
 
     ResultCollectorPtr collector =
         funcExec->withArgs(args)->withFilter(filter)->execute(
             exFuncNameSendException, 15);
-    ASSERT(collector != nullptr, "onRegion collector NULL");
+    ASSERT(collector != nullptr, "onRegion collector nullptr");
 
     CacheableVectorPtr result = collector->getResult();
 
     if (result == nullptr) {
-      ASSERT(false, "echo String : result is NULL");
+      ASSERT(false, "echo String : result is nullptr");
     } else {
       for (int i = 0; i < result->size(); i++) {
         if (auto uFEPtr =
@@ -281,7 +281,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
 
     collector = funcExec->withArgs(arrList)->withFilter(filter)->execute(
         exFuncNameSendException, 15);
-    ASSERT(collector != nullptr, "onRegion collector for arrList NULL");
+    ASSERT(collector != nullptr, "onRegion collector for arrList nullptr");
     std::this_thread::sleep_for(std::chrono::seconds(2));
 
     try {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
index 3c86261..1c5a41a 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunction.cpp
@@ -124,7 +124,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(SERVER, StartS12)
   {
-    const char* lhp = NULL;
+    const char* lhp = nullptr;
     if (!isPoolWithEndpoint) lhp = locHostPort;
     if (isLocalServer) {
       CacheHelper::initServer(1, "func_cacheserver1_pool.xml", lhp);
@@ -137,7 +137,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(SERVER, StartS13)
   {
-    const char* lhp = NULL;
+    const char* lhp = nullptr;
     if (!isPoolWithEndpoint) lhp = locHostPort;
     if (isLocalServer) {
       CacheHelper::initServer(1, "func_cacheserver1_pool.xml", lhp);
@@ -153,13 +153,13 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(CLIENT1, StartC1)
   {
-    initClientWithPool(true, NULL, locHostPort, serverGroup, nullptr, 0, true,
-                       -1, 5, 60000);
-    // createPool(poolName, locHostPort,serverGroup, NULL, 0, true );
+    initClientWithPool(true, nullptr, locHostPort, serverGroup, nullptr, 0,
+                       true, -1, 5, 60000);
+    // createPool(poolName, locHostPort,serverGroup, nullptr, 0, true );
     // createRegionAndAttachPool(poolRegNames[0],USE_ACK, poolName);
 
     RegionPtr regPtr0 =
-        createRegionAndAttachPool(poolRegNames[0], USE_ACK, NULL);
+        createRegionAndAttachPool(poolRegNames[0], USE_ACK, nullptr);
     ;  // getHelper()->createRegion( poolRegNames[0], USE_ACK);
     regPtr0->registerAllKeys();
 
@@ -204,7 +204,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       }
       // UNUSED bool getResult = true;
       auto exc = FunctionService::onRegion(regPtr0);
-      ASSERT(exc != nullptr, "onRegion Returned NULL");
+      ASSERT(exc != nullptr, "onRegion Returned nullptr");
       auto resultList = CacheableVector::create();
 
       auto executeFunctionResult = exc->withArgs(routingObj)
@@ -212,7 +212,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                                        ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -256,7 +256,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
                                   ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -329,7 +329,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
       // UNUSED bool getResult = true;
       auto pool = apache::geode::client::PoolManager::find("__TEST_POOL1__");
       auto exc = FunctionService::onServer(pool);
-      ASSERT(exc != nullptr, "onServer Returned NULL");
+      ASSERT(exc != nullptr, "onServer Returned nullptr");
 
       auto resultList = CacheableVector::create();
 
@@ -340,7 +340,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
               ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -379,7 +379,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
               ->getResult();
 
       if (executeFunctionResult1 == nullptr) {
-        ASSERT(false, "get executeFunctionResult1 is NULL");
+        ASSERT(false, "get executeFunctionResult1 is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult1->size());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
index a453738..d012ac9 100644
--- a/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolExecuteHAFunctionPrSHOP.cpp
@@ -150,14 +150,14 @@ END_TASK_DEFINITION
 DUNIT_TASK_DEFINITION(CLIENT1, StartC1)
   {
     // initClient(true);
-    initClientWithPool(true, NULL, locHostPort, serverGroup, nullptr, 1, true,
-                       -1, 5, 60000, /*singlehop*/ true,
+    initClientWithPool(true, nullptr, locHostPort, serverGroup, nullptr, 1,
+                       true, -1, 5, 60000, /*singlehop*/ true,
                        /*threadLocal*/ true);
-    // createPool(poolName, locHostPort,serverGroup, NULL, 0, true );
+    // createPool(poolName, locHostPort,serverGroup, nullptr, 0, true );
     // createRegionAndAttachPool(poolRegNames[0],USE_ACK, poolName);
 
     RegionPtr regPtr0 =
-        createRegionAndAttachPool(poolRegNames[0], USE_ACK, NULL);
+        createRegionAndAttachPool(poolRegNames[0], USE_ACK, nullptr);
     // getHelper()->createRegion( poolRegNames[0], USE_ACK);
     regPtr0->registerAllKeys();
 
@@ -202,7 +202,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
       }
       // UNUSED bool getResult = true;
       ExecutionPtr exc = FunctionService::onRegion(regPtr0);
-      ASSERT(exc != nullptr, "onRegion Returned NULL");
+      ASSERT(exc != nullptr, "onRegion Returned nullptr");
       auto resultList = CacheableVector::create();
 
       auto executeFunctionResult =
@@ -211,7 +211,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OpTest)
               ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -281,7 +281,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
       // UNUSED bool getResult = true;
       auto pool = apache::geode::client::PoolManager::find("__TEST_POOL1__");
       auto exc = FunctionService::onServer(pool);
-      ASSERT(exc != nullptr, "onServer Returned NULL");
+      ASSERT(exc != nullptr, "onServer Returned nullptr");
 
       auto resultList = CacheableVector::create();
 
@@ -292,7 +292,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
               ->getResult();
 
       if (executeFunctionResult == nullptr) {
-        ASSERT(false, "get executeFunctionResult is NULL");
+        ASSERT(false, "get executeFunctionResult is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult->size());
@@ -331,7 +331,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, Client1OnServerHATest)
               ->getResult();
 
       if (executeFunctionResult1 == nullptr) {
-        ASSERT(false, "get executeFunctionResult1 is NULL");
+        ASSERT(false, "get executeFunctionResult1 is nullptr");
       } else {
         sprintf(buf, "echo String : result count = %d",
                 executeFunctionResult1->size());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolLocator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolLocator.cpp b/src/cppcache/integration-test/testThinClientPoolLocator.cpp
index 6bb4db9..0a9430b 100644
--- a/src/cppcache/integration-test/testThinClientPoolLocator.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolLocator.cpp
@@ -60,7 +60,7 @@ END_TASK(CreateLocators)
 DUNIT_TASK(SERVERS, CreateServer1)
   {
     // starting servers
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locHostPort1);
+    if (isLocalServer) CacheHelper::initServer(1, nullptr, locHostPort1);
     LOG("Server 1 started");
   }
 END_TASK(CreateServer1)
@@ -93,7 +93,7 @@ END_TASK(ConnectC2)
 DUNIT_TASK(SERVERS, CreateServer2)
   {
     // starting servers
-    if (isLocalServer) CacheHelper::initServer(2, NULL, locHostPort2);
+    if (isLocalServer) CacheHelper::initServer(2, nullptr, locHostPort2);
     LOG("Server 2 started");
   }
 END_TASK(CreateServer2)
@@ -137,7 +137,7 @@ END_TASK(CloseLocator1)
 DUNIT_TASK(SERVERS, ReStartS1)
   {
     // Re- starting servers
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locHostPort1);
+    if (isLocalServer) CacheHelper::initServer(1, nullptr, locHostPort1);
     LOG("Server 1 started");
   }
 END_TASK(ReStartS1)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolRedundancy.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolRedundancy.cpp b/src/cppcache/integration-test/testThinClientPoolRedundancy.cpp
index c442451..621c4e2 100644
--- a/src/cppcache/integration-test/testThinClientPoolRedundancy.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolRedundancy.cpp
@@ -130,13 +130,13 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateClient2_1)
     initClient(true);
 
     // create three regions with three pools ( each having diff redun )
-    createPool(poolNames[0], locHostPort, NULL, 2, true);
+    createPool(poolNames[0], locHostPort, nullptr, 2, true);
     createRegionAndAttachPool(poolRegNames[0], USE_ACK, poolNames[0], true);
 
-    createPool(poolNames[1], locHostPort, NULL, 1, true);
+    createPool(poolNames[1], locHostPort, nullptr, 1, true);
     createRegionAndAttachPool(poolRegNames[1], USE_ACK, poolNames[1], true);
 
-    createPool(poolNames[2], locHostPort, NULL, 0, true);
+    createPool(poolNames[2], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(poolRegNames[2], USE_ACK, poolNames[2], true);
 
     feedEntries(1);
@@ -189,13 +189,13 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateClient2_2)
     initClient(true);
 
     // create three regions with three pools ( each having diff redun )
-    createPool(poolNames[0], locHostPort, NULL, 2, true);
+    createPool(poolNames[0], locHostPort, nullptr, 2, true);
     createRegionAndAttachPool(poolRegNames[0], USE_ACK, poolNames[0], true);
 
-    createPool(poolNames[1], locHostPort, NULL, 1, true);
+    createPool(poolNames[1], locHostPort, nullptr, 1, true);
     createRegionAndAttachPool(poolRegNames[1], USE_ACK, poolNames[1], true);
 
-    createPool(poolNames[2], locHostPort, NULL, 0, true);
+    createPool(poolNames[2], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(poolRegNames[2], USE_ACK, poolNames[2], true);
 
     feedEntries(1);
@@ -272,7 +272,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, VerifyK1C1New2)
 
     CacheableKeyPtr keyPtr = createKey(keys[1]);
 
-    auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr));
+    auto checkPtr =
+        std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr));
 
     ASSERT(checkPtr != nullptr, "Value Ptr should not be null.");
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPoolServer.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolServer.cpp b/src/cppcache/integration-test/testThinClientPoolServer.cpp
index a54c9e8..d75c42c 100644
--- a/src/cppcache/integration-test/testThinClientPoolServer.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolServer.cpp
@@ -83,7 +83,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StartClient2)
   {
     initClient(true);
     // Create Pool with no server group
-    getHelper()->createPool(poolName, locHostPort, NULL);
+    getHelper()->createPool(poolName, locHostPort, nullptr);
 
     getHelper()->createRegionAndAttachPool(poolRegNames[0], USE_ACK,
                                            "__TEST_POOL1__");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
index 83faa8a..a204da5 100644
--- a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
@@ -107,10 +107,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepOne_Pooled_EndpointTL)
     initClient(true);
 
     RegionPtr regPtr = getHelper()->createPooledRegionStickySingleHop(
-        regionNames[0], USE_ACK, NULL, "__TEST_POOL1__", false, false);
+        regionNames[0], USE_ACK, nullptr, "__TEST_POOL1__", false, false);
     ASSERT(regPtr != nullptr, "Failed to create region.");
     regPtr = getHelper()->createPooledRegionStickySingleHop(
-        regionNames[1], NO_ACK, NULL, "__TEST_POOL1__", false, false);
+        regionNames[1], NO_ACK, nullptr, "__TEST_POOL1__", false, false);
     ASSERT(regPtr != nullptr, "Failed to create region.");
 
     LOG("StepOne_Pooled_EndPointTL complete.");
@@ -214,7 +214,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask)
               CacheableInt32::create(keyPtr->hashcode()));
           LOGINFO("CPPTEST: putALL CASE:: getting key %d with hashcode %d", j,
                   keyPtr->hashcode());
-          valMap.insert(keyPtr, valPtr);
+          valMap.emplace(keyPtr, valPtr);
         }
         LOGINFO("TEST-1");
         ACE_Time_Value startTime = ACE_OS::gettimeofday();
@@ -274,7 +274,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopRemoveAllForIntKeysTask)
           auto valPtr = CacheableInt32::create(keyPtr->hashcode());
           LOGINFO("CPPTEST: removeall CASE:: getting key %d with hashcode %d",
                   j, keyPtr->hashcode());
-          valMap.insert(keyPtr, valPtr);
+          valMap.emplace(keyPtr, valPtr);
           keys.push_back(keyPtr);
         }
         LOGINFO("TEST-1");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientPutWithDelta.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPutWithDelta.cpp b/src/cppcache/integration-test/testThinClientPutWithDelta.cpp
index e4588ec..2ba2e3b 100644
--- a/src/cppcache/integration-test/testThinClientPutWithDelta.cpp
+++ b/src/cppcache/integration-test/testThinClientPutWithDelta.cpp
@@ -23,7 +23,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-CacheHelper* cacheHelper = NULL;
+CacheHelper* cacheHelper = nullptr;
 bool isLocalServer = false;
 
 static bool isLocator = false;
@@ -39,7 +39,7 @@ int DeltaEx::fromDeltaCount = 0;
 int DeltaEx::fromDataCount = 0;
 int DeltaEx::cloneCount = 0;
 void initClient(const bool isthinClient) {
-  if (cacheHelper == NULL) {
+  if (cacheHelper == nullptr) {
     cacheHelper = new CacheHelper(isthinClient);
   }
   ASSERT(cacheHelper, "Failed to create a CacheHelper client instance.");
@@ -51,14 +51,14 @@ void initClientNoPools() {
 }
 
 void cleanProc() {
-  if (cacheHelper != NULL) {
+  if (cacheHelper != nullptr) {
     delete cacheHelper;
-    cacheHelper = NULL;
+    cacheHelper = nullptr;
   }
 }
 
 CacheHelper* getHelper() {
-  ASSERT(cacheHelper != NULL, "No cacheHelper initialized.");
+  ASSERT(cacheHelper != nullptr, "No cacheHelper initialized.");
   return cacheHelper;
 }
 
@@ -189,8 +189,8 @@ DUNIT_TASK_DEFINITION(SERVER1, CreateServer1_DisableDelta)
   {
     // starting servers
     if (isLocalServer) {
-      CacheHelper::initServer(1, "cacheserver_with_delta.xml", locatorsG, NULL,
-                              false, false);
+      CacheHelper::initServer(1, "cacheserver_with_delta.xml", locatorsG,
+                              nullptr, false, false);
     }
   }
 END_TASK_DEFINITION

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
index a6e5570..f9ae075 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
@@ -56,7 +56,7 @@ void initClient() {
     // ignore exception
   }
   initClient(true);
-  ASSERT(getHelper() != NULL, "null CacheHelper");
+  ASSERT(getHelper() != nullptr, "null CacheHelper");
 }
 
 DUNIT_TASK_DEFINITION(LOCATOR, StartLocator)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
index 5dc3456..8dd51e4 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
@@ -63,7 +63,7 @@ void clientOperations() {
   try {
     QueryServicePtr qs = nullptr;  // getHelper()->cachePtr->getQueryService();
 
-    qs = createPool2("_TESTFAILPOOL_", NULL, NULL)->getQueryService();
+    qs = createPool2("_TESTFAILPOOL_", nullptr, nullptr)->getQueryService();
 
     SelectResultsPtr results;
     QueryPtr qry = qs->newQuery("select distinct * from /Portfolios");
@@ -76,7 +76,7 @@ void clientOperations() {
   }
 
   PoolPtr pool1 = nullptr;
-  pool1 = createPool(poolNames[0], locHostPort, NULL, 0, true);
+  pool1 = createPool(poolNames[0], locHostPort, nullptr, 0, true);
   createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
 
   RegionPtr rptr = getHelper()->cachePtr->getRegion(qRegionNames[0]);
@@ -174,12 +174,6 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
 END_TASK_DEFINITION
 
 DUNIT_MAIN
-  {
-    CALL_TASK(StartLocator)
-    CALL_TASK(CreateServerWithLocator)
-    CALL_TASK(ClientOpPoolLocator)
-    CALL_TASK(CloseCache1)
-    CALL_TASK(CloseServer)
-    CALL_TASK(CloseLocator)
-  }
-END_MAIN
+{CALL_TASK(StartLocator) CALL_TASK(CreateServerWithLocator)
+     CALL_TASK(ClientOpPoolLocator) CALL_TASK(CloseCache1)
+         CALL_TASK(CloseServer) CALL_TASK(CloseLocator)} END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
index 560312d..41d3466 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
@@ -70,7 +70,7 @@ bool isLocator = false;
 bool isLocalServer = false;
 
 const char* qRegionNames[] = {"Portfolios", "Positions"};
-KillServerThread* kst = NULL;
+KillServerThread* kst = nullptr;
 const char* poolNames[] = {"Pool1", "Pool2", "Pool3"};
 const char* locHostPort =
     CacheHelper::getLocatorHostPort(isLocator, isLocalServer, 1);
@@ -122,7 +122,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, RegisterTypesAndCreatePoolAndRegion)
     initClient(true);
 
     isPoolConfig = true;
-    createPool(poolNames[0], locHostPort, NULL, 0, true);
+    createPool(poolNames[0], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
 
     RegionPtr rptr = getHelper()->cachePtr->getRegion(qRegionNames[0]);
@@ -226,17 +226,15 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
   }
 END_TASK_DEFINITION
 
-void runRemoteQueryFailoverTest() {
-  CALL_TASK(StartLocator)
-  CALL_TASK(CreateServer1WithLocator)
-  CALL_TASK(RegisterTypesAndCreatePoolAndRegion)
-  CALL_TASK(CreateServer2WithLocator)
-  CALL_TASK(ValidateQueryExecutionAcrossServerFailure)
-  CALL_TASK(CloseCache1)
-  CALL_TASK(CloseServer2)
-  CALL_TASK(CloseLocator)
-}
+void runRemoteQueryFailoverTest(){
+    CALL_TASK(StartLocator) CALL_TASK(CreateServer1WithLocator)
+        CALL_TASK(RegisterTypesAndCreatePoolAndRegion)
+            CALL_TASK(CreateServer2WithLocator)
+                CALL_TASK(ValidateQueryExecutionAcrossServerFailure)
+                    CALL_TASK(CloseCache1) CALL_TASK(CloseServer2)
+                        CALL_TASK(CloseLocator)}
 
-DUNIT_MAIN
-  { runRemoteQueryFailoverTest(); }
+DUNIT_MAIN {
+  runRemoteQueryFailoverTest();
+}
 END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
index 15cdc47..70ae63f 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
@@ -70,7 +70,7 @@ bool isLocator = false;
 bool isLocalServer = false;
 
 const char* qRegionNames[] = {"Portfolios", "Positions"};
-KillServerThread* kst = NULL;
+KillServerThread* kst = nullptr;
 const char* poolNames[] = {"Pool1", "Pool2", "Pool3"};
 const char* locHostPort =
     CacheHelper::getLocatorHostPort(isLocator, isLocalServer, 1);
@@ -122,7 +122,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, RegisterTypesAndCreatePoolAndRegion)
     initClient(true);
 
     isPoolConfig = true;
-    createPool(poolNames[0], locHostPort, NULL, 0, true);
+    createPool(poolNames[0], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
 
     RegionPtr rptr = getHelper()->cachePtr->getRegion(qRegionNames[0]);
@@ -226,17 +226,15 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
   }
 END_TASK_DEFINITION
 
-void runRemoteQueryFailoverTest() {
-  CALL_TASK(StartLocator)
-  CALL_TASK(CreateServer1WithLocator)
-  CALL_TASK(RegisterTypesAndCreatePoolAndRegion)
-  CALL_TASK(CreateServer2WithLocator)
-  CALL_TASK(ValidateQueryExecutionAcrossServerFailure)
-  CALL_TASK(CloseCache1)
-  CALL_TASK(CloseServer2)
-  CALL_TASK(CloseLocator)
-}
+void runRemoteQueryFailoverTest(){
+    CALL_TASK(StartLocator) CALL_TASK(CreateServer1WithLocator)
+        CALL_TASK(RegisterTypesAndCreatePoolAndRegion)
+            CALL_TASK(CreateServer2WithLocator)
+                CALL_TASK(ValidateQueryExecutionAcrossServerFailure)
+                    CALL_TASK(CloseCache1) CALL_TASK(CloseServer2)
+                        CALL_TASK(CloseLocator)}
 
-DUNIT_MAIN
-  { runRemoteQueryFailoverTest(); }
+DUNIT_MAIN {
+  runRemoteQueryFailoverTest();
+}
 END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
index 1500531..d8e1db2 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
@@ -61,7 +61,7 @@ void stepOne() {
   // Create just one pool and attach all regions to that.
   initClient(true);
   isPoolConfig = true;
-  createPool(poolNames[0], locHostPort, NULL, 0, true);
+  createPool(poolNames[0], locHostPort, nullptr, 0, true);
   createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
   createRegionAndAttachPool(qRegionNames[1], USE_ACK, poolNames[0]);
   createRegionAndAttachPool(qRegionNames[2], USE_ACK, poolNames[0]);
@@ -198,12 +198,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFour)
         if (!m_isPdx) {
           SerializablePtr ser = (*rsptr)[rows];
           if (std::dynamic_pointer_cast<Portfolio>(ser)) {
-            PortfolioPtr portfolio = std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
+            PortfolioPtr portfolio =
+                std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
             printf(
                 "   query idx %d pulled portfolio object ID %d, pkid  :: %s\n",
                 i, portfolio->getID(), portfolio->getPkid()->asChar());
           } else if (std::dynamic_pointer_cast<Position>(ser)) {
-            PositionPtr position = std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
+            PositionPtr position =
+                std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
             printf(
                 "   query idx %d pulled position object secId %s, shares  :: "
                 "%d\n",
@@ -221,13 +223,15 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFour)
         } else {
           SerializablePtr pdxser = (*rsptr)[rows];
           if (std::dynamic_pointer_cast<PortfolioPdx>(pdxser)) {
-            PortfolioPdxPtr portfoliopdx = std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(pdxser);
+            PortfolioPdxPtr portfoliopdx =
+                std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(pdxser);
             printf(
                 "   query idx %d pulled portfolioPdx object ID %d, pkid %s  :: "
                 "\n",
                 i, portfoliopdx->getID(), portfoliopdx->getPkid());
           } else if (std::dynamic_pointer_cast<PositionPdx>(pdxser)) {
-            PositionPdxPtr positionpdx = std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(pdxser);
+            PositionPdxPtr positionpdx =
+                std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(pdxser);
             printf(
                 "   query idx %d pulled positionPdx object secId %s, shares %d "
                 " "
@@ -310,13 +314,15 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFive)
           if (!m_isPdx) {
             SerializablePtr ser = (*rsptr)[rows];
             if (std::dynamic_pointer_cast<Portfolio>(ser)) {
-              PortfolioPtr portfolio = std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
+              PortfolioPtr portfolio =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
               printf(
                   "   query idx %d pulled portfolio object ID %d, pkid  :: "
                   "%s\n",
                   i, portfolio->getID(), portfolio->getPkid()->asChar());
             } else if (std::dynamic_pointer_cast<Position>(ser)) {
-              PositionPtr position = std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
+              PositionPtr position =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
               printf(
                   "   query idx %d pulled position object secId %s, shares  :: "
                   "%d\n",
@@ -335,14 +341,17 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFive)
             SerializablePtr pdxser = (*rsptr)[rows];
             if (std::dynamic_pointer_cast<PortfolioPdx>(pdxser)) {
               PortfolioPdxPtr portfoliopdx =
-                  std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(pdxser);
+                  std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(
+                      pdxser);
               printf(
                   "   query idx %d pulled portfolioPdx object ID %d, pkid %s  "
                   ":: "
                   "\n",
                   i, portfoliopdx->getID(), portfoliopdx->getPkid());
             } else if (std::dynamic_pointer_cast<PositionPdx>(pdxser)) {
-              PositionPdxPtr positionpdx = std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(pdxser);
+              PositionPdxPtr positionpdx =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(
+                      pdxser);
               printf(
                   "   query idx %d pulled positionPdx object secId %s, shares "
                   "%d "
@@ -432,12 +441,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepSix)
           if (!m_isPdx) {
             SerializablePtr ser = (*rsptr)[rows];
             if (std::dynamic_pointer_cast<Portfolio>(ser)) {
-              PortfolioPtr portfolio = std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
+              PortfolioPtr portfolio =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPtr)>(ser);
               printf(
                   "   query idx %d pulled portfolio object ID %d, pkid %s : \n",
                   i, portfolio->getID(), portfolio->getPkid()->asChar());
             } else if (std::dynamic_pointer_cast<Position>(ser)) {
-              PositionPtr position = std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
+              PositionPtr position =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PositionPtr)>(ser);
               printf(
                   "   query idx %d pulled position object secId %s, shares %d  "
                   ": "
@@ -456,14 +467,16 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepSix)
           } else {
             SerializablePtr ser = (*rsptr)[rows];
             if (std::dynamic_pointer_cast<PortfolioPdx>(ser)) {
-              PortfolioPdxPtr portfoliopdx = std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(ser);
+              PortfolioPdxPtr portfoliopdx =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PortfolioPdxPtr)>(ser);
               printf(
                   "   query idx %d pulled portfolioPdx object ID %d, pkid %s  "
                   ": "
                   "\n",
                   i, portfoliopdx->getID(), portfoliopdx->getPkid());
             } else if (std::dynamic_pointer_cast<PositionPdx>(ser)) {
-              PositionPdxPtr positionpdx = std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(ser);
+              PositionPdxPtr positionpdx =
+                  std::static_pointer_cast<GF_UNWRAP_SP(PositionPdxPtr)>(ser);
               printf(
                   "   query idx %d pulled positionPdx object secId %s, shares "
                   "%d "
@@ -572,13 +585,12 @@ void runRemoteQueryRSTest() {
 
 void setPortfolioPdxType() { CALL_TASK(SetPortfolioTypeToPdx) }
 
-void UnsetPortfolioType() { CALL_TASK(UnsetPortfolioTypeToPdx) }
+void UnsetPortfolioType(){CALL_TASK(UnsetPortfolioTypeToPdx)}
 
-DUNIT_MAIN
-  {
-    for (int i = 0; i < 2; i++) {
-      runRemoteQueryRSTest();
-      setPortfolioPdxType();
-    }
+DUNIT_MAIN {
+  for (int i = 0; i < 2; i++) {
+    runRemoteQueryRSTest();
+    setPortfolioPdxType();
   }
+}
 END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
index 254db9e..77ca605 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
@@ -49,15 +49,14 @@ bool isPoolConfig = false;  // To track if pool case is running
 const char* qRegionNames[] = {"Portfolios", "Positions", "Portfolios2",
                               "Portfolios3"};
 const char* checkNullString(const char* str) {
-  return ((str == NULL) ? "(null)" : str);
+  return ((str == nullptr) ? "(null)" : str);
 }
 
 const wchar_t* checkNullString(const wchar_t* str) {
-  return ((str == NULL) ? L"(null)" : str);
+  return ((str == nullptr) ? L"(null)" : str);
 }
 
 void _printFields(CacheablePtr field, Struct* ssptr, int32_t& fields) {
-
   if (auto portfolio = std::dynamic_pointer_cast<Portfolio>(field)) {
     printf("   pulled %s :- ID %d, pkid %s\n",
            checkNullString(ssptr->getFieldName(fields)), portfolio->getID(),
@@ -116,10 +115,10 @@ void _printFields(CacheablePtr field, Struct* ssptr, int32_t& fields) {
       } else if (auto map =
                      std::dynamic_pointer_cast<CacheableHashMap>(field)) {
         int index = 0;
-        for (auto iter = map->begin(); iter != map->end(); iter++) {
+        for (const auto& iter : *map) {
           printf("   hashMap %d of %d ... \n", ++index, map->size());
-          _printFields(iter.first(), ssptr, fields);
-          _printFields(iter.second(), ssptr, fields);
+          _printFields(iter.first, ssptr, fields);
+          _printFields(iter.second, ssptr, fields);
         }
         printf("   end of map \n");
       } else if (auto structimpl = std::dynamic_pointer_cast<Struct>(field)) {
@@ -129,7 +128,7 @@ void _printFields(CacheablePtr field, Struct* ssptr, int32_t& fields) {
              inner_fields++) {
           SerializablePtr field = (*structimpl)[inner_fields];
           if (field == nullptr) {
-            printf("we got null fields here, probably we have NULL data\n");
+            printf("we got null fields here, probably we have nullptr data\n");
             continue;
           }
 
@@ -156,8 +155,8 @@ void _verifyStructSet(StructSetPtr& ssptr, int i) {
     }
 
     Struct* siptr = dynamic_cast<Struct*>(((*ssptr)[rows]).get());
-    if (siptr == NULL) {
-      printf("siptr is NULL \n\n");
+    if (siptr == nullptr) {
+      printf("siptr is nullptr \n\n");
       continue;
     }
 
@@ -165,7 +164,7 @@ void _verifyStructSet(StructSetPtr& ssptr, int i) {
     for (int32_t fields = 0; fields < siptr->length(); fields++) {
       SerializablePtr field = (*siptr)[fields];
       if (field == nullptr) {
-        printf("we got null fields here, probably we have NULL data\n");
+        printf("we got null fields here, probably we have nullptr data\n");
         continue;
       }
 
@@ -179,15 +178,14 @@ void compareMaps(HashMapOfCacheable& map, HashMapOfCacheable& expectedMap) {
   ASSERT(expectedMap.size() == map.size(),
          "Unexpected number of entries in map");
   LOGINFO("Got expected number of %d entries in map", map.size());
-  for (HashMapOfCacheable::Iterator iter = map.begin(); iter != map.end();
-       ++iter) {
-    const CacheableKeyPtr& key = iter.first();
-    const CacheablePtr& val = iter.second();
-    HashMapOfCacheable::Iterator expectedIter = expectedMap.find(key);
+  for (const auto& iter : map) {
+    const auto& key = iter.first;
+    const auto& val = iter.second;
+    const auto& expectedIter = expectedMap.find(key);
     if (expectedIter == expectedMap.end()) {
       FAIL("Could not find expected key in map");
     }
-    const CacheablePtr& expectedVal = expectedIter.second();
+    const auto& expectedVal = expectedIter->second;
 
     if (std::dynamic_pointer_cast<PositionPdx>(expectedVal)) {
       const PositionPdxPtr& posVal =
@@ -226,7 +224,7 @@ void stepOne() {
   initGridClient(true);
 
   isPoolConfig = true;
-  createPool(poolNames[0], locHostPort, NULL, 0, true);
+  createPool(poolNames[0], locHostPort, nullptr, 0, true);
   createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
   createRegionAndAttachPool(qRegionNames[1], USE_ACK, poolNames[0]);
   createRegionAndAttachPool(qRegionNames[2], USE_ACK, poolNames[0]);
@@ -371,11 +369,12 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFive)
       if (structsetQueries[i].category != unsupported) {
         auto qry = qs->newQuery(structsetQueries[i].query());
         auto results = qry->execute();
-        if (!qh->verifySS(results, (qh->isExpectedRowsConstantSS(i)
-                                        ? structsetRowCounts[i]
-                                        : structsetRowCounts[i] *
-                                              qh->getPortfolioNumSets()),
-                          structsetFieldCounts[i])) {
+        if (!qh->verifySS(
+                results,
+                (qh->isExpectedRowsConstantSS(i)
+                     ? structsetRowCounts[i]
+                     : structsetRowCounts[i] * qh->getPortfolioNumSets()),
+                structsetFieldCounts[i])) {
           char failmsg[100] = {0};
           ACE_OS::sprintf(failmsg, "Query verify failed for query index %d", i);
           ASSERT(false, failmsg);
@@ -434,11 +433,12 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepSix)
         }
 
         auto results = qry->execute(paramList);
-        if (!qh->verifySS(results, (qh->isExpectedRowsConstantSSPQ(i)
-                                        ? structsetRowCountsPQ[i]
-                                        : structsetRowCountsPQ[i] *
-                                              qh->getPortfolioNumSets()),
-                          structsetFieldCountsPQ[i])) {
+        if (!qh->verifySS(
+                results,
+                (qh->isExpectedRowsConstantSSPQ(i)
+                     ? structsetRowCountsPQ[i]
+                     : structsetRowCountsPQ[i] * qh->getPortfolioNumSets()),
+                structsetFieldCountsPQ[i])) {
           char failmsg[100] = {0};
           ACE_OS::sprintf(failmsg, "Query verify failed for query index %d", i);
           ASSERT(false, failmsg);
@@ -492,7 +492,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetAll)
                                                  current * 100);
 
         posKeys.push_back(posKey);
-        expectedPosMap.insert(posKey, pos);
+        expectedPosMap.emplace(posKey, pos);
       }
     }
 
@@ -510,7 +510,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetAll)
         auto port = std::make_shared<PortfolioPdx>(current, 1);
 
         portKeys.push_back(portKey);
-        expectedPortMap.insert(portKey, port);
+        expectedPortMap.emplace(portKey, port);
       }
     }
 
@@ -608,18 +608,8 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
 END_TASK_DEFINITION
 
 DUNIT_MAIN
-  {
-    CALL_TASK(StartLocator)
-    CALL_TASK(CreateServerWithLocator)
-    CALL_TASK(StepOnePoolLoc)
-    CALL_TASK(StepThree)
-    CALL_TASK(StepFour)
-    CALL_TASK(StepFive)
-    CALL_TASK(StepSix)
-    CALL_TASK(GetAll)
-    CALL_TASK(DoQuerySSError)
-    CALL_TASK(CloseCache1)
-    CALL_TASK(CloseServer1)
-    CALL_TASK(CloseLocator)
-  }
-END_MAIN
+{CALL_TASK(StartLocator) CALL_TASK(CreateServerWithLocator)
+     CALL_TASK(StepOnePoolLoc) CALL_TASK(StepThree) CALL_TASK(StepFour)
+         CALL_TASK(StepFive) CALL_TASK(StepSix) CALL_TASK(GetAll)
+             CALL_TASK(DoQuerySSError) CALL_TASK(CloseCache1)
+                 CALL_TASK(CloseServer1) CALL_TASK(CloseLocator)} END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
index 538cb27..6aca3d0 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
@@ -62,7 +62,7 @@ void stepOne() {
   }
   initClient(true);
   isPoolConfig = true;
-  createPool(poolNames[0], locHostPort, NULL, 0, true);
+  createPool(poolNames[0], locHostPort, nullptr, 0, true);
   createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
 
   RegionPtr regptr = getHelper()->getRegion(qRegionNames[0]);
@@ -550,18 +550,17 @@ void runRemoteQueryTimeoutTest() {
 
 void setPortfolioPdxType() { CALL_TASK(SetPortfolioTypeToPdx) }
 
-void UnsetPortfolioType() { CALL_TASK(UnsetPortfolioTypeToPdx) }
+void UnsetPortfolioType(){CALL_TASK(UnsetPortfolioTypeToPdx)}
 
-DUNIT_MAIN
-  {
-    // Basic Old Test
-    runRemoteQueryTimeoutTest();
+DUNIT_MAIN {
+  // Basic Old Test
+  runRemoteQueryTimeoutTest();
 
-    UnsetPortfolioType();
-    for (int runIdx = 1; runIdx <= 2; ++runIdx) {
-      // New Test with Pool + EP
-      runRemoteQueryTimeoutTest();
-      setPortfolioPdxType();
-    }
+  UnsetPortfolioType();
+  for (int runIdx = 1; runIdx <= 2; ++runIdx) {
+    // New Test with Pool + EP
+    runRemoteQueryTimeoutTest();
+    setPortfolioPdxType();
   }
+}
 END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
index e8a7ab0..629bdf5 100644
--- a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
@@ -93,13 +93,13 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepOnePoolLocator)
       // ignore exception
     }
     initClient(true);
-    createPool(poolNames[0], locHostPort, NULL, 0, true);
+    createPool(poolNames[0], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(qRegionNames[0], USE_ACK, poolNames[0]);
     createRegionAndAttachPool(qRegionNames[1], USE_ACK, poolNames[0]);
 
     createRegionAndAttachPool(qRegionNames[2], USE_ACK, poolNames[0]);
 
-    createPool(poolNames[1], locHostPort, NULL, 0, true);
+    createPool(poolNames[1], locHostPort, nullptr, 0, true);
     createRegionAndAttachPool(qRegionNames[3], USE_ACK, poolNames[1]);
 
     RegionPtr regptr = getHelper()->getRegion(qRegionNames[0]);
@@ -332,7 +332,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFive)
               {
                 char logmsg[100] = {0};
                 ACE_OS::sprintf(logmsg, "Query # %d query selectValue result is
-           NULL", i);
+           nullptr", i);
                 LOG(logmsg);
               }
               else
@@ -340,7 +340,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepFive)
                 char logmsg[100] = {0};
                 ACE_OS::sprintf(logmsg, "Query # %d query selectValue result
            size
-           is not NULL", i);
+           is not nullptr", i);
                 LOG(logmsg);
               }
         */
@@ -499,17 +499,16 @@ void runRemoteRegionQueryTest() {
 
 void setPortfolioPdxType() { CALL_TASK(SetPortfolioTypeToPdx) }
 
-void UnsetPortfolioType() { CALL_TASK(UnsetPortfolioTypeToPdx) }
+void UnsetPortfolioType(){CALL_TASK(UnsetPortfolioTypeToPdx)}
 
-DUNIT_MAIN
-  {
-    // Basic Old Test
-    // runRemoteRegionQueryTest();
+DUNIT_MAIN {
+  // Basic Old Test
+  // runRemoteRegionQueryTest();
 
-    UnsetPortfolioType();
-    for (int runIdx = 1; runIdx <= 2; ++runIdx) {
-      runRemoteRegionQueryTest();
-      setPortfolioPdxType();
-    }
+  UnsetPortfolioType();
+  for (int runIdx = 1; runIdx <= 2; ++runIdx) {
+    runRemoteRegionQueryTest();
+    setPortfolioPdxType();
   }
+}
 END_MAIN

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientRemoveOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 5f6e3b9..5e4f3a5 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -38,7 +38,7 @@ using namespace test;
 #define SERVER2 s2p2
 #define CREATE_TWICE_KEY "__create_twice_key"
 #define CREATE_TWICE_VALUE "__create_twice_value"
-CacheHelper* cacheHelper = NULL;
+CacheHelper* cacheHelper = nullptr;
 static bool isLocalServer = false;
 static bool isLocator = false;
 static int numberOfLocators = 0;
@@ -57,7 +57,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, Alter_Client_Grid_Property_2)
 END_TASK_DEFINITION
 
 void initClient(const bool isthinClient) {
-  if (cacheHelper == NULL) {
+  if (cacheHelper == nullptr) {
     PropertiesPtr config = Properties::create();
     if (g_isGridClient) {
       config->insert("grid-client", "true");
@@ -68,14 +68,14 @@ void initClient(const bool isthinClient) {
 }
 
 void cleanProc() {
-  if (cacheHelper != NULL) {
+  if (cacheHelper != nullptr) {
     delete cacheHelper;
-    cacheHelper = NULL;
+    cacheHelper = nullptr;
   }
 }
 
 CacheHelper* getHelper() {
-  ASSERT(cacheHelper != NULL, "No cacheHelper initialized.");
+  ASSERT(cacheHelper != nullptr, "No cacheHelper initialized.");
   return cacheHelper;
 }
 
@@ -107,7 +107,7 @@ void _verifyEntry(const char* name, const char* key, const char* val,
   if (noKey == false) {  // need to find the key!
     ASSERT(regPtr->containsKey(keyPtr), "Key not found in region.");
   }
-  if (val != NULL) {  // need to have a value!
+  if (val != nullptr) {  // need to have a value!
     ASSERT(regPtr->containsValueForKey(keyPtr), "Value not found in region.");
   }
 
@@ -127,7 +127,7 @@ void _verifyEntry(const char* name, const char* key, const char* val,
       }
       ASSERT(containsKeyCnt < MAX, "Key found in region.");
     }
-    if (val == NULL) {
+    if (val == nullptr) {
       if (regPtr->containsValueForKey(keyPtr)) {
         containsValueCnt++;
       } else {
@@ -136,7 +136,7 @@ void _verifyEntry(const char* name, const char* key, const char* val,
       ASSERT(containsValueCnt < MAX, "Value found in region.");
     }
 
-    if (val != NULL) {
+    if (val != nullptr) {
       auto checkPtr =
           std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr));
 
@@ -326,7 +326,7 @@ void doGetAgain(const char* name, const char* key, const char* value) {
             checkPtr->asChar(), key);
     LOG(buf);
   } else {
-    LOG("checkPtr is NULL");
+    LOG("checkPtr is nullptr");
   }
   verifyEntry(name, key, value);
   LOG("GetAgain complete.");
@@ -365,7 +365,7 @@ void doNetsearch(const char* name, const char* key, const char* value) {
             checkPtr->asChar(), key);
     LOG(buf);
   } else {
-    LOG("checkPtr is NULL");
+    LOG("checkPtr is nullptr");
   }
   verifyEntry(name, key, value);
   LOG("Netsearch complete.");
@@ -409,7 +409,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(SERVER1, CreateServer1_With_Locator)
   {
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locatorsG);
+    if (isLocalServer) CacheHelper::initServer(1, nullptr, locatorsG);
     LOG("SERVER1 with locator started");
   }
 END_TASK_DEFINITION
@@ -637,10 +637,10 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
     putEntry(regionNames[1], keys[3], vals[3]);
     reg0->localInvalidate(keys[1]);
     reg1->localInvalidate(keys[3]);
-    ASSERT(reg0->remove(keys[1], (CacheablePtr)nullptr) == false,
+    ASSERT(reg0->remove(keys[1], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value is not present "
            "locally, but present only on server.");
-    ASSERT(reg1->remove(keys[3], (CacheablePtr)nullptr) == false,
+    ASSERT(reg1->remove(keys[3], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value is not present "
            "locally, but present only on server.");
     ASSERT(reg0->containsKey(keys[1]) == true, "containsKey should be true");
@@ -673,10 +673,10 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
 
     // Try removing a entry with a null value, which is not present on client as
     // well as server, result should be false.
-    ASSERT(reg0->remove("NewKey1", (CacheablePtr)nullptr) == false,
+    ASSERT(reg0->remove("NewKey1", (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value is not present "
            "locally, and not present on server.");
-    ASSERT(reg1->remove("NewKey3", (CacheablePtr)nullptr) == false,
+    ASSERT(reg1->remove("NewKey3", (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value is not present "
            "locally, and not present on server.");
     ASSERT(reg0->containsKey("NewKey1") == false,
@@ -715,10 +715,10 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
     putEntry(regionNames[1], keys[3], nvals[3]);
     reg0->destroy(keys[1]);
     reg1->destroy(keys[3]);
-    ASSERT(reg0->remove(keys[1], (CacheablePtr)nullptr) == false,
+    ASSERT(reg0->remove(keys[1], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exist "
            "locally, but exists on server.");
-    ASSERT(reg1->remove(keys[3], (CacheablePtr)nullptr) == false,
+    ASSERT(reg1->remove(keys[3], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exist "
            "locally, but exists on server.");
     ASSERT(reg0->containsKey(keys[1]) == false, "containsKey should be false");
@@ -729,7 +729,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
            "containsKeyOnServer should be false");
     LOG("Step6.8.1 complete.");
 
-    // Try locally removing an entry which is locally destroyed with a NULL.
+    // Try locally removing an entry which is locally destroyed with a nullptr.
     reg0->put(keys[1], vals[1]);
     reg1->put(keys[3], vals[3]);
     ASSERT(reg0->remove(keys[1], vals[1]) == true,
@@ -833,30 +833,31 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
     ASSERT(reg1->containsKey(keys[3]) == true, "containsKey should be true");
     LOG("Step6.12 complete.");
 
-    // Try locally removing an entry (value) which is invalidated with a NULL.
+    // Try locally removing an entry (value) which is invalidated with a
+    // nullptr.
     reg0->localDestroy(keys[1]);
     reg1->localDestroy(keys[3]);
     reg0->localPut(keys[1], vals[1]);
     reg1->localPut(keys[3], vals[3]);
     reg0->invalidate(keys[1]);
     reg1->invalidate(keys[3]);
-    ASSERT(reg0->localRemove(keys[1], (CacheablePtr)nullptr) == true,
+    ASSERT(reg0->localRemove(keys[1], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value does not exists "
            "locally.");
-    ASSERT(reg1->localRemove(keys[3], (CacheablePtr)nullptr) == true,
+    ASSERT(reg1->localRemove(keys[3], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value does not exists "
            "locally.");
     ASSERT(reg0->containsKey(keys[1]) == false, "containsKey should be false");
     ASSERT(reg1->containsKey(keys[3]) == false, "containsKey should be false");
     LOG("Step6.13 complete.");
 
-    // Try locally removing an entry (value) with a NULL.
+    // Try locally removing an entry (value) with a nullptr.
     reg0->localPut(keys[1], vals[1]);
     reg1->localPut(keys[3], vals[3]);
-    ASSERT(reg0->localRemove(keys[1], (CacheablePtr)nullptr) == false,
+    ASSERT(reg0->localRemove(keys[1], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exists "
            "locally.");
-    ASSERT(reg1->localRemove(keys[3], (CacheablePtr)nullptr) == false,
+    ASSERT(reg1->localRemove(keys[3], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exists "
            "locally.");
     ASSERT(reg0->containsKey(keys[1]) == true, "containsKey should be true");
@@ -878,15 +879,15 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix)
     ASSERT(reg1->containsKey(keys[3]) == false, "containsKey should be true");
     LOG("Step6.15 complete.");
 
-    // Try locally removing an entry which is locally destroyed with a NULL.
+    // Try locally removing an entry which is locally destroyed with a nullptr.
     reg0->localPut(keys[1], vals[1]);
     reg1->localPut(keys[3], vals[3]);
     reg0->localDestroy(keys[1]);
     reg1->localDestroy(keys[3]);
-    ASSERT(reg0->localRemove(keys[1], (CacheablePtr)nullptr) == false,
+    ASSERT(reg0->localRemove(keys[1], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exists "
            "locally.");
-    ASSERT(reg1->localRemove(keys[3], (CacheablePtr)nullptr) == false,
+    ASSERT(reg1->localRemove(keys[3], (CacheablePtr) nullptr) == false,
            "Result of remove should be false, as this value does not exists "
            "locally.");
     ASSERT(reg0->containsKey(keys[1]) == false, "containsKey should be false");
@@ -973,10 +974,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight)
     reg->localDestroy(keys[0]);
     reg->localDestroy(keys[1]);
     SLEEP(10000);  // This is for expiration on server to execute.
-    ASSERT(reg->remove(keys[0], (CacheablePtr)nullptr) == true,
+    ASSERT(reg->remove(keys[0], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value is not present "
            "locally, & not present on server.");
-    ASSERT(reg->remove(keys[1], (CacheablePtr)nullptr) == true,
+    ASSERT(reg->remove(keys[1], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value is not present "
            "locally, & not present on server.");
     ASSERT(reg->containsKeyOnServer(keyPtr) == false,
@@ -1012,11 +1013,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight)
     putEntry(regionNames[2], keys[1], nvals[1]);
     SLEEP(10000);  // This is for expiration on server to execute.
     ASSERT(
-        reg->remove(keys[0], (CacheablePtr)nullptr) == false,
+        reg->remove(keys[0], (CacheablePtr) nullptr) == false,
         "Result of remove should be false, as this value is present locally, "
         "& not present on server.");
     ASSERT(
-        reg->remove(keys[1], (CacheablePtr)nullptr) == false,
+        reg->remove(keys[1], (CacheablePtr) nullptr) == false,
         "Result of remove should be false, as this value is present locally, "
         "& not present on server.");
     ASSERT(reg->containsKey(keys[0]) == true, "containsKey should be true");
@@ -1037,10 +1038,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight)
     reg->invalidate(keys[0]);
     reg->invalidate(keys[1]);
     SLEEP(10000);  // This is for expiration on server to execute.
-    ASSERT(reg->remove(keys[0], (CacheablePtr)nullptr) == true,
+    ASSERT(reg->remove(keys[0], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value is not present "
            "locally, & not present on server.");
-    ASSERT(reg->remove(keys[1], (CacheablePtr)nullptr) == true,
+    ASSERT(reg->remove(keys[1], (CacheablePtr) nullptr) == true,
            "Result of remove should be true, as this value is not present "
            "locally, & not present on server.");
     ASSERT(reg->containsKey(keys[0]) == false, "containsKey should be false");
@@ -1427,7 +1428,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepTwelve)
     regPtr0->localPut(keyObject4, valObject1);
     regPtr0->localDestroy(keyObject4);
     /*try {
-          objVal1 = std::dynamic_pointer_cast<PdxTests::PdxType>(regPtr0->get(keyObject4));;//
+          objVal1 =
+    std::dynamic_pointer_cast<PdxTests::PdxType>(regPtr0->get(keyObject4));;//
     need to verify that if entry is deleted then some exception should be thrown
           FAIL("Expected EntryExistException here for get");
     }catch (Exception)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientSSLAuthCorrupt.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLAuthCorrupt.cpp b/src/cppcache/integration-test/testThinClientSSLAuthCorrupt.cpp
index 867ac80..a6d8b81 100644
--- a/src/cppcache/integration-test/testThinClientSSLAuthCorrupt.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLAuthCorrupt.cpp
@@ -29,7 +29,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-CacheHelper* cacheHelper = NULL;
+CacheHelper* cacheHelper = nullptr;
 bool isLocalServer = false;
 
 static bool isLocator = false;
@@ -40,7 +40,7 @@ const char* locatorsG =
 #define SERVER1 s2p1
 
 void initClient(const bool isthinClient) {
-  if (cacheHelper == NULL) {
+  if (cacheHelper == nullptr) {
     PropertiesPtr props = Properties::create();
     props->insert("ssl-enabled", "true");
     std::string keystore = std::string(ACE_OS::getenv("TESTSRC")) + "/keystore";
@@ -53,18 +53,17 @@ void initClient(const bool isthinClient) {
   ASSERT(cacheHelper, "Failed to create a CacheHelper client instance.");
 }
 void cleanProc() {
-  if (cacheHelper != NULL) {
+  if (cacheHelper != nullptr) {
     delete cacheHelper;
-    cacheHelper = NULL;
+    cacheHelper = nullptr;
   }
 }
 
 CacheHelper* getHelper() {
-  ASSERT(cacheHelper != NULL, "No cacheHelper initialized.");
+  ASSERT(cacheHelper != nullptr, "No cacheHelper initialized.");
   return cacheHelper;
 }
 
-
 void createPooledRegion(const char* name, bool ackMode, const char* locators,
                         const char* poolname,
                         bool clientNotificationEnabled = false,
@@ -100,12 +99,10 @@ void createEntry(const char* name, const char* key, const char* value) {
   regPtr->put(keyPtr, valPtr);
   LOG("Created entry.");
 
-  //verifyEntry(name, key, value);
+  // verifyEntry(name, key, value);
   LOG("Entry created.");
 }
 
-
-
 const char* keys[] = {"Key-1", "Key-2", "Key-3", "Key-4"};
 const char* vals[] = {"Value-1", "Value-2", "Value-3", "Value-4"};
 const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
@@ -124,12 +121,12 @@ DUNIT_TASK_DEFINITION(SERVER1, CreateLocator1_With_SSL_untrustedCert)
   }
 END_TASK_DEFINITION
 
-
-
 DUNIT_TASK_DEFINITION(SERVER1, CreateServer1_With_Locator_And_SSL_untrustedCert)
   {
     // starting servers
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locatorsG, NULL, true, true, false, false, false);
+    if (isLocalServer)
+      CacheHelper::initServer(1, nullptr, locatorsG, nullptr, true, true, false,
+                              false, false);
   }
 END_TASK_DEFINITION
 
@@ -146,8 +143,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateRegions1_PoolLocators)
     try {
       regPtr->registerAllKeys(false, nullptr, false, false);
       FAIL("Should have got NotConnectedException during registerAllKeys");
-    }
-    catch (NotConnectedException exp) {
+    } catch (NotConnectedException exp) {
       LOG("Connection Failed as expected via NotConnectedException");
     }
     LOG("CreateRegions1_PoolLocators complete.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientSSLAuthFail.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLAuthFail.cpp b/src/cppcache/integration-test/testThinClientSSLAuthFail.cpp
index 53ebc9f..16cc0e6 100644
--- a/src/cppcache/integration-test/testThinClientSSLAuthFail.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLAuthFail.cpp
@@ -29,7 +29,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-CacheHelper* cacheHelper = NULL;
+CacheHelper* cacheHelper = nullptr;
 bool isLocalServer = false;
 
 static bool isLocator = false;
@@ -40,7 +40,7 @@ const char* locatorsG =
 #define SERVER1 s2p1
 
 void initClient(const bool isthinClient) {
-  if (cacheHelper == NULL) {
+  if (cacheHelper == nullptr) {
     PropertiesPtr props = Properties::create();
     props->insert("ssl-enabled", "true");
     std::string keystore = std::string(ACE_OS::getenv("TESTSRC")) + "/keystore";
@@ -53,18 +53,17 @@ void initClient(const bool isthinClient) {
   ASSERT(cacheHelper, "Failed to create a CacheHelper client instance.");
 }
 void cleanProc() {
-  if (cacheHelper != NULL) {
+  if (cacheHelper != nullptr) {
     delete cacheHelper;
-    cacheHelper = NULL;
+    cacheHelper = nullptr;
   }
 }
 
 CacheHelper* getHelper() {
-  ASSERT(cacheHelper != NULL, "No cacheHelper initialized.");
+  ASSERT(cacheHelper != nullptr, "No cacheHelper initialized.");
   return cacheHelper;
 }
 
-
 void createPooledRegion(const char* name, bool ackMode, const char* locators,
                         const char* poolname,
                         bool clientNotificationEnabled = false,
@@ -100,12 +99,10 @@ void createEntry(const char* name, const char* key, const char* value) {
   regPtr->put(keyPtr, valPtr);
   LOG("Created entry.");
 
-  //verifyEntry(name, key, value);
+  // verifyEntry(name, key, value);
   LOG("Entry created.");
 }
 
-
-
 const char* keys[] = {"Key-1", "Key-2", "Key-3", "Key-4"};
 const char* vals[] = {"Value-1", "Value-2", "Value-3", "Value-4"};
 const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
@@ -124,12 +121,12 @@ DUNIT_TASK_DEFINITION(SERVER1, CreateLocator1_With_SSL_untrustedCert)
   }
 END_TASK_DEFINITION
 
-
-
 DUNIT_TASK_DEFINITION(SERVER1, CreateServer1_With_Locator_And_SSL_untrustedCert)
   {
     // starting servers
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locatorsG, NULL, true, true, false, false, true);
+    if (isLocalServer)
+      CacheHelper::initServer(1, nullptr, locatorsG, nullptr, true, true, false,
+                              false, true);
   }
 END_TASK_DEFINITION
 
@@ -146,8 +143,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateRegions1_PoolLocators)
     try {
       regPtr->registerAllKeys(false, nullptr, false, false);
       FAIL("Should have got NotConnectedException during registerAllKeys");
-    }
-    catch (NotConnectedException exp) {
+    } catch (NotConnectedException exp) {
       LOG("Connection Failed as expected via NotConnectedException");
     }
     LOG("CreateRegions1_PoolLocators complete.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientSSLAuthUntrusted.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLAuthUntrusted.cpp b/src/cppcache/integration-test/testThinClientSSLAuthUntrusted.cpp
index 402c5e3..21f0500 100644
--- a/src/cppcache/integration-test/testThinClientSSLAuthUntrusted.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLAuthUntrusted.cpp
@@ -29,7 +29,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-CacheHelper* cacheHelper = NULL;
+CacheHelper* cacheHelper = nullptr;
 bool isLocalServer = false;
 
 static bool isLocator = false;
@@ -40,7 +40,7 @@ const char* locatorsG =
 #define SERVER1 s2p1
 
 void initClient(const bool isthinClient) {
-  if (cacheHelper == NULL) {
+  if (cacheHelper == nullptr) {
     PropertiesPtr props = Properties::create();
     props->insert("ssl-enabled", "true");
     std::string keystore = std::string(ACE_OS::getenv("TESTSRC")) + "/keystore";
@@ -54,18 +54,17 @@ void initClient(const bool isthinClient) {
   ASSERT(cacheHelper, "Failed to create a CacheHelper client instance.");
 }
 void cleanProc() {
-  if (cacheHelper != NULL) {
+  if (cacheHelper != nullptr) {
     delete cacheHelper;
-    cacheHelper = NULL;
+    cacheHelper = nullptr;
   }
 }
 
 CacheHelper* getHelper() {
-  ASSERT(cacheHelper != NULL, "No cacheHelper initialized.");
+  ASSERT(cacheHelper != nullptr, "No cacheHelper initialized.");
   return cacheHelper;
 }
 
-
 void createPooledRegion(const char* name, bool ackMode, const char* locators,
                         const char* poolname,
                         bool clientNotificationEnabled = false,
@@ -101,12 +100,10 @@ void createEntry(const char* name, const char* key, const char* value) {
   regPtr->put(keyPtr, valPtr);
   LOG("Created entry.");
 
-  //verifyEntry(name, key, value);
+  // verifyEntry(name, key, value);
   LOG("Entry created.");
 }
 
-
-
 const char* keys[] = {"Key-1", "Key-2", "Key-3", "Key-4"};
 const char* vals[] = {"Value-1", "Value-2", "Value-3", "Value-4"};
 const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
@@ -125,12 +122,12 @@ DUNIT_TASK_DEFINITION(SERVER1, CreateLocator1_With_SSL_untrustedCert)
   }
 END_TASK_DEFINITION
 
-
-
 DUNIT_TASK_DEFINITION(SERVER1, CreateServer1_With_Locator_And_SSL_untrustedCert)
   {
     // starting servers
-    if (isLocalServer) CacheHelper::initServer(1, NULL, locatorsG, NULL, true, true, false, false, false);
+    if (isLocalServer)
+      CacheHelper::initServer(1, nullptr, locatorsG, nullptr, true, true, false,
+                              false, false);
   }
 END_TASK_DEFINITION
 
@@ -147,8 +144,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateRegions1_PoolLocators)
     try {
       regPtr->registerAllKeys(false, nullptr, false, false);
       FAIL("Should have got NotConnectedException during registerAllKeys");
-    }
-    catch (NotConnectedException exp) {
+    } catch (NotConnectedException exp) {
       LOG("Connection Failed as expected via NotConnectedException");
     }
     LOG("CreateRegions1_PoolLocators complete.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/11467dd9/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
index e91ddbf..e386709 100644
--- a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
@@ -38,7 +38,7 @@ CredentialGeneratorPtr credentialGeneratorHandler;
 std::string getXmlPath() {
   char xmlPath[1000] = {'\0'};
   const char* path = ACE_OS::getenv("TESTSRC");
-  ASSERT(path != NULL,
+  ASSERT(path != nullptr,
          "Environment variable TESTSRC for test source directory is not set.");
   strncpy(xmlPath, path, strlen(path) - strlen("cppcache"));
   strcat(xmlPath, "xml/Security/");
@@ -65,7 +65,7 @@ void initCredentialGenerator() {
   }
 
   if (credentialGeneratorHandler == nullptr) {
-    FAIL("credentialGeneratorHandler is NULL");
+    FAIL("credentialGeneratorHandler is nullptr");
   }
 
   loopNum++;
@@ -126,13 +126,16 @@ void initClientAuth(char UserType) {
   credentialGeneratorHandler->getAuthInit(config);
   switch (UserType) {
     case 'W':
-      credentialGeneratorHandler->getAllowedCredentialsForOps(wr, config, NULL);
+      credentialGeneratorHandler->getAllowedCredentialsForOps(wr, config,
+                                                              nullptr);
       break;
     case 'R':
-      credentialGeneratorHandler->getAllowedCredentialsForOps(rt, config, NULL);
+      credentialGeneratorHandler->getAllowedCredentialsForOps(rt, config,
+                                                              nullptr);
       break;
     case 'A':
-      credentialGeneratorHandler->getAllowedCredentialsForOps(ad, config, NULL);
+      credentialGeneratorHandler->getAllowedCredentialsForOps(ad, config,
+                                                              nullptr);
     default:
       break;
   }
@@ -227,7 +230,7 @@ DUNIT_TASK_DEFINITION(ADMIN_CLIENT, StepOne)
       HashMapOfCacheable entrymap;
       entrymap.clear();
       for (int i = 0; i < 5; i++) {
-        entrymap.insert(CacheableKey::create(i), CacheableInt32::create(i));
+        entrymap.emplace(CacheableKey::create(i), CacheableInt32::create(i));
       }
       RegionPtr regPtr = getHelper()->getRegion(regionNamesAuth[0]);
       regPtr->putAll(entrymap);
@@ -314,7 +317,7 @@ DUNIT_TASK_DEFINITION(WRITER_CLIENT, StepTwo)
       HashMapOfCacheable entrymap;
       entrymap.clear();
       for (int i = 0; i < 5; i++) {
-        entrymap.insert(CacheableKey::create(i), CacheableInt32::create(i));
+        entrymap.emplace(CacheableKey::create(i), CacheableInt32::create(i));
       }
       RegionPtr regPtr = getHelper()->getRegion(regionNamesAuth[0]);
       regPtr->putAll(entrymap);
@@ -347,7 +350,7 @@ DUNIT_TASK_DEFINITION(WRITER_CLIENT, StepTwo)
         LOG(buf);
         FAIL("Should not get the value");
       } else {
-        LOG("checkPtr is NULL");
+        LOG("checkPtr is nullptr");
       }
     }
     HANDLE_NOT_AUTHORIZED_EXCEPTION
@@ -475,7 +478,7 @@ DUNIT_TASK_DEFINITION(READER_CLIENT, StepThree)
                 checkPtr->asChar(), keys[2]);
         LOG(buf);
       } else {
-        LOG("checkPtr is NULL");
+        LOG("checkPtr is nullptr");
       }
     }
     HANDLE_NO_NOT_AUTHORIZED_EXCEPTION
@@ -495,7 +498,7 @@ DUNIT_TASK_DEFINITION(READER_CLIENT, StepThree)
       HashMapOfCacheable entrymap;
       entrymap.clear();
       for (int i = 0; i < 5; i++) {
-        entrymap.insert(CacheableKey::create(i), CacheableInt32::create(i));
+        entrymap.emplace(CacheableKey::create(i), CacheableInt32::create(i));
       }
       regPtr0->putAll(entrymap);
       FAIL("PutAll should not have completed successfully");


Mime
View raw message