zookeeper-commits mailing list archives

Author: mahadev
Date: Wed Apr  8 22:39:10 2009
New Revision: 763435

URL: http://svn.apache.org/viewvc?rev=763435&view=rev
Log:
ZOOKEEPER-347. zkfuse uses non-standard String. (patrick hunt via mahadev)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=763435&r1=763434&r2=763435&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Apr  8 22:39:10 2009
@@ -43,6 +43,8 @@
 
   ZOOKEEPER-370. Fix critical problems reported by findbugs. (flavio via mahadev)
 
+  ZOOKEEPER-347. zkfuse uses non-standard String. (patrick hunt via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)

Modified: hadoop/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc?rev=763435&r1=763434&r2=763435&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc (original)
+++ hadoop/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc Wed Apr  8 22:39:10 2009
@@ -4279,7 +4279,7 @@
     /**
      * Initialize log4cxx 
      */
-    const String file("log4cxx.properties");
+    const std::string file("log4cxx.properties");
     PropertyConfigurator::configureAndWatch( file, 5000 );
     LOG_INFO(LOG, "Starting zkfuse");