From 726a8eda08e4022fcbcb0581ec2650e07e39910b Mon Sep 17 00:00:00 2001 From: Raghavendra Prabhu Date: Wed, 16 Nov 2016 01:06:00 +0000 Subject: [PATCH] ZOOKEEPER-2633: contrib/zkfuse build fix with gcc 6.2. The build fails in two places: https://gist.github.com/ronin13/3e08569dd6c69bf2ad92fa39fa85f7ee One is boost related, and other is due to false being passed where NULL is required. JIRA: https://issues.apache.org/jira/browse/ZOOKEEPER-2633 Author: Raghavendra Prabhu --- src/contrib/zkfuse/src/event.h | 2 +- src/contrib/zkfuse/src/zkadapter.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/contrib/zkfuse/src/event.h b/src/contrib/zkfuse/src/event.h index 0506932f7a3..936ecc60453 100644 --- a/src/contrib/zkfuse/src/event.h +++ b/src/contrib/zkfuse/src/event.h @@ -213,7 +213,7 @@ class GenericEvent { /** * The event represented as abstract wrapper. */ - shared_ptr m_eventWrapper; + boost::shared_ptr m_eventWrapper; }; diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc index 7dfb9078fc3..7f02fa33b72 100644 --- a/src/contrib/zkfuse/src/zkadapter.cc +++ b/src/contrib/zkfuse/src/zkadapter.cc @@ -673,7 +673,7 @@ ZooKeeperAdapter::deleteNode(const string &path, LOG_WARN( LOG, "Error %d for %s", rc, path.c_str() ); //get all children and delete them recursively... vector nodeList; - getNodeChildren( nodeList, path, false ); + getNodeChildren( nodeList, path, NULL ); for (vector::const_iterator i = nodeList.begin(); i != nodeList.end(); ++i) {