Docs: Copyright updates for 2018 (#114)

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

diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h
index b4621f99f17dc601c35ea756f99014a99f5b459a..5e39c4366762888817b35fc29871c00e4bc613bd 100644 (file)
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -1,48 +1,24 @@
 /*
+ * Copyright (C) 1996-2018 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_ACLINTRANGE_H
 #define SQUID_ACLINTRANGE_H
 
 #include "acl/Data.h"
-#include "CbDataList.h"
-#include "Range.h"
+#include "base/Range.h"
+
+#include <list>
 
-/// \ingroup ACLAPI
 class ACLIntRange : public ACLData<int>
 {
 
 public:
-    ACLIntRange() {};
+    ACLIntRange() {}
 
     virtual ~ACLIntRange();
     virtual bool match(int);
@@ -53,7 +29,8 @@ public:
 
 private:
     typedef Range<int> RangeType;
-    CbDataListContainer <RangeType> ranges;
+    std::list<RangeType> ranges;
 };
 
 #endif /* SQUID_ACLINTRANGE_H */
+