Skip to content

Commit

Permalink
ZOOKEEPER-2633: contrib/zkfuse build fix with gcc 6.2.
Browse files Browse the repository at this point in the history
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 <me@rdprabhu.com>
  • Loading branch information
ronin13 authored and Raghavendra D Prabhu committed Nov 17, 2016
1 parent 73e102a commit 726a8ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/contrib/zkfuse/src/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class GenericEvent {
/**
* The event represented as abstract wrapper.
*/
shared_ptr<AbstractEventWrapper> m_eventWrapper;
boost::shared_ptr<AbstractEventWrapper> m_eventWrapper;

};

Expand Down
2 changes: 1 addition & 1 deletion src/contrib/zkfuse/src/zkadapter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 726a8ed

Please sign in to comment.