From c91910cd7cf9a0fab1b015b67bc70e7468b9fa50 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 18 May 2007 18:30:30 +0000 Subject: [PATCH] Change EVENT_BASE_FREE_FIX for EVENTXX_BASE_FREE_FIX. It's better to have some kind of namespace for compiler flags too. --- Doxyfile | 2 +- eventxx | 8 ++++---- test/Makefile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doxyfile b/Doxyfile index fb7c014..ba9978d 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1013,7 +1013,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = EVENT_BASE_FREE_FIX +PREDEFINED = EVENTXX_BASE_FREE_FIX # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/eventxx b/eventxx index 7dd8c48..e2391b5 100644 --- a/eventxx +++ b/eventxx @@ -142,8 +142,8 @@ * patch your libevent (for example, using this patch * written by Mark D. Anderson, and who knows why it's not still applied). If - * you do so, you can compile your programs with @c -DEVENT_BASE_FREE_FIX so - * @c event_base_free() gets called in the eventxx::dispatcher @link + * you do so, you can compile your programs with @c -DEVENTXX_EVENT_BASE_FREE_FIX + * so @c event_base_free() gets called in the eventxx::dispatcher @link * eventxx::dispatcher::~dispatcher() destructor @endlink. * * That said, I think it's still pretty usable anyways. If something is broken @@ -791,14 +791,14 @@ struct dispatcher internal::event_base_priority_init(_event_base, npriorities); } -#ifdef EVENT_BASE_FREE_FIX +#ifdef EVENTXX_BASE_FREE_FIX /// Free dispatcher resources, see @ref Status section for details. ~dispatcher() throw() { event_base_free(_event_base); } #else #warning "The dispatcher class *will* leak memory because of a libevent bug, " \ "see http://www.mail-archive.com/libevent-users@monkey.org/msg00110.html " \ "for more info an a patch. If you already have this patch, please " \ - "-DEVENT_BASE_FREE_FIX to your compiler to make this message disappear " \ + "-DEVENTXX_EVENT_BASE_FREE_FIX to your compiler to make this message disappear " \ "and really free the dispatcher memory using event_base_free()." #endif diff --git a/test/Makefile b/test/Makefile index 477a591..1519df2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -2,7 +2,7 @@ CXXFLAGS=-I.. -g -Wall # Uncomment this if you have a fixed event_base_free(). # See http://www.mail-archive.com/libevent-users@monkey.org/msg00112.html -#CXXFLAGS+=-DEVENT_BASE_FREE_FIX +#CXXFLAGS+=-DEVENTXX_EVENT_BASE_FREE_FIX LDFLAGS=-levent targets=bench test-eof test-time test-weof trivial c-way functor-way \ -- 2.43.0