SourceFormat Enforcement

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

diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h
index 89ad43b1891f4814030b3122c254334af9ef8654..47ef42f754511819d87cc9df746f062eb66390f9 100644 (file)
--- a/src/CompositePoolNode.h
+++ b/src/CompositePoolNode.h
@@ -1,48 +1,23 @@
 /*
- * DEBUG: section 77    Delay Pools
- * AUTHOR: Robert Collins <robertc@squid-cache.org>
- * Based upon original delay pools code by
- *   David Luyer <david@luyer.net>
+ * Copyright (C) 1996-2015 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.
  */
+
+/* DEBUG: section 77    Delay Pools */
+
 #ifndef COMPOSITEPOOLNODE_H
 #define COMPOSITEPOOLNODE_H
 
-#if DELAY_POOLS
-#include "squid.h"
+#if USE_DELAY_POOLS
 #include "auth/UserRequest.h"
-#include "DelayPools.h"
-#include "DelayIdComposite.h"
 #include "CommRead.h"
+#include "DelayIdComposite.h"
+#include "DelayPools.h"
 #include "ip/Address.h"
+#include "SquidString.h"
 
 class StoreEntry;
 
@@ -73,7 +48,9 @@ public:
         CompositeSelectionDetails() {}
 
         Ip::Address src_addr;
-        AuthUserRequest::Pointer user;
+#if USE_AUTH
+        Auth::UserRequest::Pointer user;
+#endif
         String tag;
     };
 
@@ -82,5 +59,6 @@ protected:
     DeferredReadManager deferredReads;
 };
 
-#endif /* DELAY_POOLS */
+#endif /* USE_DELAY_POOLS */
 #endif /* COMPOSITEPOOLNODE_H */
+