Author: phunt
Date: Wed Apr 29 19:11:39 2009
New Revision: 769882
URL: http://svn.apache.org/viewvc?rev=769882&view=rev
Log:
ZOOKEEPER-382. zookeeper cpp tests fails on 64 bit machines with gcc 4.1.2
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/c/tests/TestClient.cc
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=769882&r1=769881&r2=769882&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Apr 29 19:11:39 2009
@@ -64,6 +64,9 @@
ZOOKEEPER-377. running ant cppunit tests, a failure still results in
BUILD SUCCESSFUL (giri via mahadev)
+ ZOOKEEPER-382. zookeeper cpp tests fails on 64 bit machines with gcc 4.1.2
+ (mahadev via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-308. improve the atomic broadcast performance 3x.
(breed via mahadev)
Modified: hadoop/zookeeper/trunk/src/c/tests/TestClient.cc
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/tests/TestClient.cc?rev=769882&r1=769881&r2=769882&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/tests/TestClient.cc (original)
+++ hadoop/zookeeper/trunk/src/c/tests/TestClient.cc Wed Apr 29 19:11:39 2009
@@ -270,7 +270,8 @@
static zhandle_t *async_zk;
static void statCompletion(int rc, const struct Stat *stat, const void
*data) {
- CPPUNIT_ASSERT_EQUAL((int)data, rc);
+ int tmp = (int) (long) data;
+ CPPUNIT_ASSERT_EQUAL(tmp, rc);
}
static void stringCompletion(int rc, const char *value, const void *data) {
@@ -288,7 +289,8 @@
}
static void voidCompletion(int rc, const void *data) {
- CPPUNIT_ASSERT_EQUAL((int)data, rc);
+ int tmp = (int) (long) data;
+ CPPUNIT_ASSERT_EQUAL(tmp, rc);
}
static void verifyCreateFails(const char *path, zhandle_t *zk) {
