SourceFormat Enforcement

[thirdparty/squid.git] / src / acl / HttpStatus.h

diff --git a/src/acl/HttpStatus.h b/src/acl/HttpStatus.h
index a3846af8edc840981846c0d26be219a86e272254..b5d6b07b5240f3a74503336f6be3962e181a4c8a 100644 (file)
--- a/src/acl/HttpStatus.h
+++ b/src/acl/HttpStatus.h
@@ -1,33 +1,9 @@
 /*
+ * 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.
- *
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * 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_ACLHTTPSTATUS_H
@@ -50,10 +26,9 @@ struct acl_httpstatus_data {
 /// \ingroup ACLAPI
 class ACLHTTPStatus : public ACL
 {
-
-public:
     MEMPROXY_CLASS(ACLHTTPStatus);
 
+public:
     ACLHTTPStatus(char const *);
     ACLHTTPStatus(ACLHTTPStatus const &);
     ~ACLHTTPStatus();
@@ -70,10 +45,9 @@ public:
 protected:
     static Prototype RegistryProtoype;
     static ACLHTTPStatus RegistryEntry_;
-    SplayNode<acl_httpstatus_data*> *data;
+    Splay<acl_httpstatus_data*> *data;
     char const *class_;
 };
 
-MEMPROXY_CLASS_INLINE(ACLHTTPStatus);
-
 #endif /* SQUID_ACLHTTPSTATUS_H */
+