Repository: zookeeper Updated Branches: refs/heads/branch-3.5 68b7dca59 -> 6fcedf95c
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 <merdprabhu.com> Author: Raghavendra Prabhu <[email protected]> Reviewers: Michael Han <[email protected]> Closes #110 from ronin13/c++-build-fix (cherry picked from commit 3bd4ed98021b033acdd5eae583d84e86fc3430e4) Signed-off-by: Michael Han <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/6fcedf95 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/6fcedf95 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/6fcedf95 Branch: refs/heads/branch-3.5 Commit: 6fcedf95c08b5d0ab3326809ff25c894ab49f5d8 Parents: 68b7dca Author: Raghavendra Prabhu <[email protected]> Authored: Sun Jan 22 16:42:36 2017 -0800 Committer: Michael Han <[email protected]> Committed: Sun Jan 22 16:42:47 2017 -0800 ---------------------------------------------------------------------- src/contrib/zkfuse/src/event.h | 2 +- src/contrib/zkfuse/src/zkadapter.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/6fcedf95/src/contrib/zkfuse/src/event.h ---------------------------------------------------------------------- diff --git a/src/contrib/zkfuse/src/event.h b/src/contrib/zkfuse/src/event.h index 0506932..936ecc6 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<AbstractEventWrapper> m_eventWrapper; + boost::shared_ptr<AbstractEventWrapper> m_eventWrapper; }; http://git-wip-us.apache.org/repos/asf/zookeeper/blob/6fcedf95/src/contrib/zkfuse/src/zkadapter.cc ---------------------------------------------------------------------- diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc index 7dfb907..7f02fa3 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<string> nodeList; - getNodeChildren( nodeList, path, false ); + getNodeChildren( nodeList, path, NULL ); for (vector<string>::const_iterator i = nodeList.begin(); i != nodeList.end(); ++i) {
