Author: kpvdr Date: 2009-08-05 15:47:33 -0400 (Wed, 05 Aug 2009) New Revision: 3546 Modified: store/trunk/cpp/rhel4-support/rhel4.patch Log: Revised RHEL4 patch Modified: store/trunk/cpp/rhel4-support/rhel4.patch =================================================================== --- store/trunk/cpp/rhel4-support/rhel4.patch 2009-08-05 17:48:12 UTC (rev 3545) +++ store/trunk/cpp/rhel4-support/rhel4.patch 2009-08-05 19:47:33 UTC (rev 3546) @@ -1,6 +1,6 @@ Index: tests/.valgrind.supp =================================================================== ---- tests/.valgrind.supp (revision 3519) +--- tests/.valgrind.supp (revision 3545) +++ tests/.valgrind.supp (working copy) @@ -1,33 +1,74 @@ { @@ -102,17 +102,17 @@ Index: configure.ac =================================================================== ---- configure.ac (revision 3413) +--- configure.ac (revision 3545) +++ configure.ac (working copy) -@@ -54,7 +54,6 @@ +@@ -62,7 +62,6 @@ # -Wshadow - warns about boost headers. - if test "${enableval}" = yes; then + if test "$enable_WARNINGS" = yes; then - gl_COMPILER_FLAGS(-Werror) gl_COMPILER_FLAGS(-pedantic) gl_COMPILER_FLAGS(-Wall) gl_COMPILER_FLAGS(-Wextra) -@@ -63,7 +62,6 @@ +@@ -71,7 +70,6 @@ gl_COMPILER_FLAGS(-Wcast-qual) gl_COMPILER_FLAGS(-Wcast-align) gl_COMPILER_FLAGS(-Wno-long-long) @@ -122,9 +122,9 @@ AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS]) Index: lib/MessageStoreImpl.cpp =================================================================== ---- lib/MessageStoreImpl.cpp (revision 3413) +--- lib/MessageStoreImpl.cpp (revision 3545) +++ lib/MessageStoreImpl.cpp (working copy) -@@ -304,10 +304,6 @@ +@@ -314,10 +314,6 @@ dbenv->set_lg_regionmax(256000); // default = 65000 dbenv->open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0); } catch (const DbException& e) { @@ -134,3 +134,4 @@ - "db_upgrade or using db_recover - but the db4-utils package must also be installed to use these utilities.)", e); THROW_STORE_EXCEPTION_2("Error opening environment", e); } +