Author: kpvdr
Date: 2010-12-03 07:23:44 -0500 (Fri, 03 Dec 2010)
New Revision: 4421
Modified:
store/trunk/cpp/Makefile.am
store/trunk/cpp/configure.ac
store/trunk/cpp/lib/JournalImpl.h
Log:
Removed references to subdir perf2 which were included by mistake in last checkin
Modified: store/trunk/cpp/Makefile.am
===================================================================
--- store/trunk/cpp/Makefile.am 2010-12-02 20:48:07 UTC (rev 4420)
+++ store/trunk/cpp/Makefile.am 2010-12-03 12:23:44 UTC (rev 4421)
@@ -28,7 +28,7 @@
sysconf_DATA = etc/rhmd.conf
-SUBDIRS = lib tests tools perf perf2 docs
+SUBDIRS = lib tests tools perf docs
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2010-12-02 20:48:07 UTC (rev 4420)
+++ store/trunk/cpp/configure.ac 2010-12-03 12:23:44 UTC (rev 4421)
@@ -221,7 +221,6 @@
lib/Makefile
lib/jrnl2/Makefile
perf/Makefile
- perf2/Makefile
tests/Makefile
tests/cluster/Makefile
tests/jrnl/Makefile
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2010-12-02 20:48:07 UTC (rev 4420)
+++ store/trunk/cpp/lib/JournalImpl.h 2010-12-03 12:23:44 UTC (rev 4421)
@@ -247,7 +247,7 @@
JournalImpl(timer, journalId, journalDirectory, journalBaseFilename,
getEventsTimeout, flushTimeout, agent)
{}
- ~TplJournalImpl() {}
+ virtual ~TplJournalImpl() {}
// Special version of read_data_record that ignores transactions - needed when
reading the TPL
inline mrg::journal::iores read_data_record(void** const datapp, std::size_t&
dsize,