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 2018/09/21 18:29:06 UTC

[geode-native] branch develop updated: GEODE-5259: Fix clang (xcode 10) build breaks (#360)

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 576ff68  GEODE-5259: Fix clang (xcode 10) build breaks (#360)
576ff68 is described below

commit 576ff68eab8cdc6b626dd74a915a554a3c3173c1
Author: Blake Bender <ek...@hotmail.com>
AuthorDate: Fri Sep 21 18:29:01 2018 +0000

    GEODE-5259: Fix clang (xcode 10) build breaks (#360)
    
    - remove unused parameters from SerializableHelper<DataSerializableInternal>::metadataEqualTo()
    - remove problematic clang-format properties
    - remove gratuitous type cast
    
    Co-authored-by: Mike Martell <mm...@pivotal.io>
    Co-authored-by: Ivan Godwin <ig...@pivotal.io>
---
 .clang-format                                  | 4 ----
 cppcache/integration-test/testThinClientCq.cpp | 2 +-
 cppcache/src/SerializableHelper.hpp            | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.clang-format b/.clang-format
index 8057f96..2fcd3f1 100644
--- a/.clang-format
+++ b/.clang-format
@@ -92,10 +92,6 @@ PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
-RawStringFormats: 
-  - Delimiter:       pb
-    Language:        TextProto
-    BasedOnStyle:    google
 ReflowComments:  true
 #SortIncludes:    true
 SortIncludes:    false
diff --git a/cppcache/integration-test/testThinClientCq.cpp b/cppcache/integration-test/testThinClientCq.cpp
index d454534..10b864e 100644
--- a/cppcache/integration-test/testThinClientCq.cpp
+++ b/cppcache/integration-test/testThinClientCq.cpp
@@ -447,7 +447,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepThree)
         std::shared_ptr<CqListener> cqLstner(new MyCqListener1026);
         cqFac.addCqListener(cqLstner);
         auto cqAttr = cqFac.create();
-        auto qry = qs->newCq((char*)"1026_MyCq", qryStr, cqAttr);
+        auto qry = qs->newCq("1026_MyCq", qryStr, cqAttr);
 
         // execute Cq Query with initial Results
         auto resultsPtr = qry->executeWithInitialResults();
diff --git a/cppcache/src/SerializableHelper.hpp b/cppcache/src/SerializableHelper.hpp
index a6d7bec..fbce73d 100644
--- a/cppcache/src/SerializableHelper.hpp
+++ b/cppcache/src/SerializableHelper.hpp
@@ -93,7 +93,7 @@ inline bool SerializableHelper<PdxSerializable>::equalTo(
 
 template <>
 inline bool SerializableHelper<DataSerializableInternal>::metadataEqualTo(
-    const DataSerializableInternal& lhs, const DataSerializableInternal& rhs) {
+    const DataSerializableInternal&, const DataSerializableInternal&) {
   return true;
 }