浏览代码

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 <me@rdprabhu.com>

Reviewers: Michael Han <hanm@apache.org>

Closes #110 from ronin13/c++-build-fix
Raghavendra Prabhu 8 年之前
父节点
当前提交
3bd4ed9802
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/contrib/zkfuse/src/event.h
  2. 1 1
      src/contrib/zkfuse/src/zkadapter.cc

+ 1 - 1
src/contrib/zkfuse/src/event.h

@@ -213,7 +213,7 @@ class GenericEvent {
         /**
         /**
          * The event represented as abstract wrapper.
          * The event represented as abstract wrapper.
          */
          */
-        shared_ptr<AbstractEventWrapper> m_eventWrapper;
+        boost::shared_ptr<AbstractEventWrapper> m_eventWrapper;
         
         
 };
 };
     
     

+ 1 - 1
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() );
             LOG_WARN( LOG, "Error %d for %s", rc, path.c_str() );
             //get all children and delete them recursively...
             //get all children and delete them recursively...
             vector<string> nodeList;
             vector<string> nodeList;
-            getNodeChildren( nodeList, path, false );
+            getNodeChildren( nodeList, path, NULL );
             for (vector<string>::const_iterator i = nodeList.begin();
             for (vector<string>::const_iterator i = nodeList.begin();
                  i != nodeList.end();
                  i != nodeList.end();
                  ++i) {
                  ++i) {