You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2021/08/18 15:40:05 UTC

[geode-native] branch develop updated: Fix formatting (#845)

This is an automated email from the ASF dual-hosted git repository.

bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1a3469d  Fix formatting (#845)
1a3469d is described below

commit 1a3469da959e881bc8bcce14facb9e5f43a4c942
Author: Blake Bender <bb...@pivotal.io>
AuthorDate: Wed Aug 18 08:39:58 2021 -0700

    Fix formatting (#845)
    
    We took an update to the clang tools a couple days ago, and the new clang-format disagrees with the previous version on a couple of files.
---
 .../integration-test/testThinClientPdxTests.cpp    |  8 +++---
 cppcache/src/RegionAttributes.cpp                  | 31 ++++++++--------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/cppcache/integration-test/testThinClientPdxTests.cpp b/cppcache/integration-test/testThinClientPdxTests.cpp
index 0f706c0..a575837 100644
--- a/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -4435,14 +4435,12 @@ DUNIT_MAIN
 
     // PDXReaderWriterInvalidUsage
     {
-        // disable see bug 999 for more details.
-        // testReaderWriterInvalidUsage();
+      // disable see bug 999 for more details.
+      // testReaderWriterInvalidUsage();
     }
 
     // Test LinkedList
-    {
-      runJavaInterOpsUsingLinkedList();
-    }
+    { runJavaInterOpsUsingLinkedList(); }
 
     // NestedPdxOps
     { runNestedPdxOps(); }
diff --git a/cppcache/src/RegionAttributes.cpp b/cppcache/src/RegionAttributes.cpp
index 55811af..5e5e4e3 100644
--- a/cppcache/src/RegionAttributes.cpp
+++ b/cppcache/src/RegionAttributes.cpp
@@ -64,9 +64,8 @@ std::shared_ptr<CacheLoader> RegionAttributes::getCacheLoader() const {
     if (CacheXmlParser::managedCacheLoaderFn_ &&
         m_cacheLoaderFactory.find('.') != std::string::npos) {
       // this is a managed library
-      m_cacheLoader.reset((
-          CacheXmlParser::managedCacheLoaderFn_)(m_cacheLoaderLibrary.c_str(),
-                                                 m_cacheLoaderFactory.c_str()));
+      m_cacheLoader.reset((CacheXmlParser::managedCacheLoaderFn_)(
+          m_cacheLoaderLibrary.c_str(), m_cacheLoaderFactory.c_str()));
     } else {
       auto funcptr = Utils::getFactoryFunction<CacheLoader*()>(
           m_cacheLoaderLibrary, m_cacheLoaderFactory);
@@ -81,9 +80,8 @@ std::shared_ptr<CacheWriter> RegionAttributes::getCacheWriter() const {
     if (CacheXmlParser::managedCacheWriterFn_ &&
         m_cacheWriterFactory.find('.') != std::string::npos) {
       // this is a managed library
-      m_cacheWriter.reset((
-          CacheXmlParser::managedCacheWriterFn_)(m_cacheWriterLibrary.c_str(),
-                                                 m_cacheWriterFactory.c_str()));
+      m_cacheWriter.reset((CacheXmlParser::managedCacheWriterFn_)(
+          m_cacheWriterLibrary.c_str(), m_cacheWriterFactory.c_str()));
     } else {
       auto funcptr = Utils::getFactoryFunction<CacheWriter*()>(
           m_cacheWriterLibrary, m_cacheWriterFactory);
@@ -98,11 +96,8 @@ std::shared_ptr<CacheListener> RegionAttributes::getCacheListener() const {
     if (CacheXmlParser::managedCacheListenerFn_ &&
         m_cacheListenerFactory.find('.') != std::string::npos) {
       // this is a managed library
-      m_cacheListener.reset(
-          (CacheXmlParser::managedCacheListenerFn_)(m_cacheListenerLibrary
-                                                        .c_str(),
-                                                    m_cacheListenerFactory
-                                                        .c_str()));
+      m_cacheListener.reset((CacheXmlParser::managedCacheListenerFn_)(
+          m_cacheListenerLibrary.c_str(), m_cacheListenerFactory.c_str()));
     } else {
       auto funcptr = Utils::getFactoryFunction<CacheListener*()>(
           m_cacheListenerLibrary, m_cacheListenerFactory);
@@ -119,10 +114,9 @@ std::shared_ptr<PartitionResolver> RegionAttributes::getPartitionResolver()
     if (CacheXmlParser::managedPartitionResolverFn_ &&
         m_partitionResolverFactory.find('.') != std::string::npos) {
       // this is a managed library
-      m_partitionResolver.reset((
-          CacheXmlParser::
-              managedPartitionResolverFn_)(m_partitionResolverLibrary.c_str(),
-                                           m_partitionResolverFactory.c_str()));
+      m_partitionResolver.reset((CacheXmlParser::managedPartitionResolverFn_)(
+          m_partitionResolverLibrary.c_str(),
+          m_partitionResolverFactory.c_str()));
     } else {
       auto funcptr = Utils::getFactoryFunction<PartitionResolver*()>(
           m_partitionResolverLibrary, m_partitionResolverFactory);
@@ -138,11 +132,8 @@ std::shared_ptr<PersistenceManager> RegionAttributes::getPersistenceManager()
     if (CacheXmlParser::managedPersistenceManagerFn_ &&
         m_persistenceFactory.find('.') != std::string::npos) {
       // this is a managed library
-      m_persistenceManager.reset(
-          (CacheXmlParser::managedPersistenceManagerFn_)(m_persistenceLibrary
-                                                             .c_str(),
-                                                         m_persistenceFactory
-                                                             .c_str()));
+      m_persistenceManager.reset((CacheXmlParser::managedPersistenceManagerFn_)(
+          m_persistenceLibrary.c_str(), m_persistenceFactory.c_str()));
     } else {
       auto funcptr = Utils::getFactoryFunction<PersistenceManager*()>(
           m_persistenceLibrary, m_persistenceFactory);