diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /includes/HttpServer.h | |
parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'includes/HttpServer.h')
-rw-r--r-- | includes/HttpServer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/HttpServer.h b/includes/HttpServer.h index 7dbf912..6c28910 100644 --- a/includes/HttpServer.h +++ b/includes/HttpServer.h @@ -44,7 +44,7 @@ class HttpServer { class Action { public: Action(const Regex & regex, const Regex & host = Regexes::any) : m_regex(regex), m_host(host), m_refCount(0) { } - ~Action() { AAssert(m_refCount == 0, "Don't delete an Action directly"); } + virtual ~Action() { AAssert(m_refCount == 0, "Don't delete an Action directly"); } struct ActionMatch { Regex::Captures uri, host; }; |