SourceFormat Enforcement

[thirdparty/squid.git] / src / event.h

diff --git a/src/event.h b/src/event.h
index b6d61aea22b250796813e733cc597678026363d4..ed1f78344a81a721cd2d9acf8a99177fdd13e949 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,39 +1,16 @@
-
 /*
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_EVENT_H
 #define SQUID_EVENT_H
 
 #include "AsyncEngine.h"
-#include "MemPool.h"
+#include "mem/forward.h"
 
 class StoreEntry;
 
@@ -50,11 +27,11 @@ int eventFind(EVH *, void *);
 
 class ev_entry
 {
+    MEMPROXY_CLASS(ev_entry);
 
 public:
     ev_entry(char const * name, EVH * func, void *arg, double when, int weight, bool cbdata=true);
     ~ev_entry();
-    MEMPROXY_CLASS(ev_entry);
     const char *name;
     EVH *func;
     void *arg;
@@ -66,8 +43,6 @@ public:
     ev_entry *next;
 };
 
-MEMPROXY_CLASS_INLINE(ev_entry);
-
 // manages time-based events
 class EventScheduler : public AsyncEngine
 {
@@ -96,3 +71,4 @@ private:
 };
 
 #endif /* SQUID_EVENT_H */
+