From d1e045c3f00ff29b410d00e15534cd4815b24f13 Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Thu, 19 Feb 2009 00:17:31 -0700 Subject: [PATCH] Moved src/ICAP/AsyncJob.* to src/base/ to prepare for the src/ICAP move to src/adaptation/icap. --- src/AsyncJobCalls.h | 2 +- src/BodyPipe.h | 2 +- src/Server.h | 2 +- src/adaptation/AccessCheck.h | 2 +- src/adaptation/Initiate.h | 2 +- src/adaptation/Initiator.h | 2 +- src/{ICAP => base}/AsyncJob.cc | 0 src/{ICAP => base}/AsyncJob.h | 3 --- src/client_side.h | 2 +- src/client_side_request.h | 2 +- 10 files changed, 8 insertions(+), 11 deletions(-) rename src/{ICAP => base}/AsyncJob.cc (100%) rename src/{ICAP => base}/AsyncJob.h (98%) diff --git a/src/AsyncJobCalls.h b/src/AsyncJobCalls.h index 306e538c33..0657d36720 100644 --- a/src/AsyncJobCalls.h +++ b/src/AsyncJobCalls.h @@ -6,7 +6,7 @@ #ifndef SQUID_ASYNCJOBCALLS_H #define SQUID_ASYNCJOBCALLS_H -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" /* * *MemFunT are member function (i.e., class method) wrappers. They store diff --git a/src/BodyPipe.h b/src/BodyPipe.h index 7ce016ef3a..bf00268b86 100644 --- a/src/BodyPipe.h +++ b/src/BodyPipe.h @@ -4,7 +4,7 @@ #include "MemBuf.h" #include "AsyncCall.h" -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" class BodyPipe; diff --git a/src/Server.h b/src/Server.h index e7316965f6..ff8ef9e8de 100644 --- a/src/Server.h +++ b/src/Server.h @@ -37,7 +37,7 @@ #include "StoreIOBuffer.h" #include "forward.h" #include "BodyPipe.h" -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #include "CommCalls.h" #if USE_ADAPTATION diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h index 89e54045e2..0d384be582 100644 --- a/src/adaptation/AccessCheck.h +++ b/src/adaptation/AccessCheck.h @@ -1,7 +1,7 @@ #ifndef SQUID_ADAPTATION__ACCESS_CHECK_H #define SQUID_ADAPTATION__ACCESS_CHECK_H -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #include "adaptation/Elements.h" #include "adaptation/forward.h" diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h index a94c5889e6..eba205f7b8 100644 --- a/src/adaptation/Initiate.h +++ b/src/adaptation/Initiate.h @@ -2,7 +2,7 @@ #define SQUID_ADAPTATION__INITIATE_H #include "AsyncCall.h" -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #include "adaptation/forward.h" class HttpMsg; diff --git a/src/adaptation/Initiator.h b/src/adaptation/Initiator.h index 0d66074850..ba2a1254f1 100644 --- a/src/adaptation/Initiator.h +++ b/src/adaptation/Initiator.h @@ -1,7 +1,7 @@ #ifndef SQUID_ADAPTATION__INITIATOR_H #define SQUID_ADAPTATION__INITIATOR_H -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #include "adaptation/forward.h" /* diff --git a/src/ICAP/AsyncJob.cc b/src/base/AsyncJob.cc similarity index 100% rename from src/ICAP/AsyncJob.cc rename to src/base/AsyncJob.cc diff --git a/src/ICAP/AsyncJob.h b/src/base/AsyncJob.h similarity index 98% rename from src/ICAP/AsyncJob.h rename to src/base/AsyncJob.h index ee6ae45896..287f64e05d 100644 --- a/src/ICAP/AsyncJob.h +++ b/src/base/AsyncJob.h @@ -5,9 +5,6 @@ #ifndef SQUID_ASYNC_JOB_H #define SQUID_ASYNC_JOB_H -/// \todo move src/ICAP/AsyncJob.* to src/ - - #include "AsyncCall.h" #include "TextException.h" diff --git a/src/client_side.h b/src/client_side.h index 5bb37172a1..37ad29978e 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -37,7 +37,7 @@ #include "StoreIOBuffer.h" #include "BodyPipe.h" #include "RefCount.h" -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #include "CommCalls.h" class ConnStateData; diff --git a/src/client_side_request.h b/src/client_side_request.h index 7e7b9b94f8..0d1cd041c0 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -41,7 +41,7 @@ #include "client_side.h" #include "AccessLogEntry.h" #include "dlink.h" -#include "ICAP/AsyncJob.h" +#include "base/AsyncJob.h" #if USE_ADAPTATION #include "adaptation/forward.h" -- 2.47.2