From: squidadm@squid-cache.org <>
Date: Mon, 1 Dec 2014 06:11:47 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~468
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f327361e641ed6aaecf6aa612cd2ae414ac97123;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 2ebbdfc6c1..ac1a72163d 100644
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -24,9 +24,9 @@
 #include "squid.h"
 #include "cbdata.h"
 #include "Generic.h"
+#include "mem/Pool.h"
 #include "mgr/Registration.h"
 #include "Store.h"
-#include "mem/Pool.h"
 
 #include <climits>
 #if USE_CBDATA_DEBUG
diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc
index f264db09d1..fb0cb5b1b9 100644
--- a/src/mem/old_api.cc
+++ b/src/mem/old_api.cc
@@ -19,9 +19,9 @@
 #include "icmp/net_db.h"
 #include "md5.h"
 #include "mem/forward.h"
+#include "mem/Pool.h"
 #include "MemBuf.h"
 #include "memMeter.h"
-#include "mem/Pool.h"
 #include "mgr/Registration.h"
 #include "RegexList.h"
 #include "SquidConfig.h"
diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 6cc84f639a..0f7f02ede7 100644
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -46,11 +46,11 @@ STUB_SOURCE= tests/STUB.h \
 	tests/stub_libeui.cc \
 	tests/stub_libformat.cc \
 	tests/stub_libicmp.cc \
+	tests/stub_libmem.cc \
 	tests/stub_libmgr.cc \
 	tests/stub_libsslsquid.cc \
 	tests/stub_main_cc.cc \
 	tests/stub_MemBuf.cc \
-	tests/stub_libmem.cc \
 	tests/stub_mem_node.cc \
 	tests/stub_MemObject.cc \
 	tests/stub_MemStore.cc \