(trafficserver) branch master updated: cleanup: Resolve some of dependencies on private headers (#11281)

[maskit]

This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new f1892c80f1 cleanup: Resolve some of dependencies on private headers 
(#11281)
f1892c80f1 is described below

commit f1892c80f16bb6c3367c39280b59c6af5bba90c0
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Fri Apr 26 09:08:45 2024 -0600

    cleanup: Resolve some of dependencies on private headers (#11281)
---
 include/iocore/cache/CacheVC.h                     | 9 ---------
 src/iocore/cache/CacheEvacuateDocVC.cc             | 2 +-
 {include => src}/iocore/cache/CacheEvacuateDocVC.h | 0
 src/iocore/cache/CacheWrite.cc                     | 2 +-
 src/iocore/cache/P_CacheInternal.h                 | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/include/iocore/cache/CacheVC.h b/include/iocore/cache/CacheVC.h
index 93a8c84278..40f17aab8f 100644
--- a/include/iocore/cache/CacheVC.h
+++ b/include/iocore/cache/CacheVC.h
@@ -23,15 +23,6 @@
 
 #pragma once
 
-/*
-// inkcache
-#include "iocore/cache/Cache.h"
-#include "../../../src/iocore/cache/P_CacheDir.h"
-#include "../../../src/iocore/cache/P_CacheDoc.h"
-#include "../../../src/iocore/cache/P_CacheVol.h"
-*/
-#include "../../../src/iocore/cache/P_CacheHttp.h"
-
 // aio
 #include "iocore/aio/AIO.h"
 
diff --git a/src/iocore/cache/CacheEvacuateDocVC.cc 
b/src/iocore/cache/CacheEvacuateDocVC.cc
index 09aa5b772a..5ab976c700 100644
--- a/src/iocore/cache/CacheEvacuateDocVC.cc
+++ b/src/iocore/cache/CacheEvacuateDocVC.cc
@@ -32,7 +32,7 @@
 #include "P_CacheHttp.h"
 #include "P_CacheInternal.h"
 #include "P_CacheVol.h"
-#include "iocore/cache/CacheEvacuateDocVC.h"
+#include "CacheEvacuateDocVC.h"
 
 // tscore
 #include "tscore/Diags.h"
diff --git a/include/iocore/cache/CacheEvacuateDocVC.h 
b/src/iocore/cache/CacheEvacuateDocVC.h
similarity index 100%
rename from include/iocore/cache/CacheEvacuateDocVC.h
rename to src/iocore/cache/CacheEvacuateDocVC.h
diff --git a/src/iocore/cache/CacheWrite.cc b/src/iocore/cache/CacheWrite.cc
index a0839da9f9..8c6bf1faa0 100644
--- a/src/iocore/cache/CacheWrite.cc
+++ b/src/iocore/cache/CacheWrite.cc
@@ -24,7 +24,7 @@
 #include "P_Cache.h"
 #include "P_CacheDoc.h"
 #include "iocore/cache/AggregateWriteBuffer.h"
-#include "iocore/cache/CacheEvacuateDocVC.h"
+#include "CacheEvacuateDocVC.h"
 
 // These macros allow two incrementing unsigned values x and y to maintain
 // their ordering when one of them overflows, given that the values stay close 
to each other.
diff --git a/src/iocore/cache/P_CacheInternal.h 
b/src/iocore/cache/P_CacheInternal.h
index 57988c7ab7..5d677eadde 100644
--- a/src/iocore/cache/P_CacheInternal.h
+++ b/src/iocore/cache/P_CacheInternal.h
@@ -34,7 +34,7 @@
 #include "tsutil/Metrics.h"
 
 #include "iocore/cache/CacheVC.h"
-#include "iocore/cache/CacheEvacuateDocVC.h"
+#include "CacheEvacuateDocVC.h"
 
 using ts::Metrics;