Rename some files in sbuf/ and apply include paths consistently

diff --git a/src/sbuf/Algorithms.cc b/src/sbuf/Algorithms.cc
index 93436478488a73b1eae62b3b2ee89d1f99b850b9..8f2fae86011ab9773225aa147020c6100eea2d99 100644 (file)
--- a/src/sbuf/Algorithms.cc
+++ b/src/sbuf/Algorithms.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "Algorithms.h"
+#include "sbuf/Algorithms.h"
 
 // private common implementation for SBuf hash variants
 static std::size_t

diff --git a/src/sbuf/Algorithms.h b/src/sbuf/Algorithms.h
index 8655db07074e6613b1feedf78431ee39b580a154..e65284851aadedd9b0443c778a9c279317df7483 100644 (file)
--- a/src/sbuf/Algorithms.h
+++ b/src/sbuf/Algorithms.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFALGOS_H_
 #define SQUID_SBUFALGOS_H_
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <algorithm>
 #include <numeric>

diff --git a/src/sbuf/Exceptions.cc b/src/sbuf/Exceptions.cc
index 21d03ab3a77980ff0c43f8525285cc426e427922..2c7a4ef7e1fc0fc11de4746128cede0490f2f5ee 100644 (file)
--- a/src/sbuf/Exceptions.cc
+++ b/src/sbuf/Exceptions.cc
@@ -7,8 +7,8 @@
  */
 
 #include "squid.h"
-#include "OutOfBoundsException.h"
-#include "SBuf.h"
+#include "sbuf/OutOfBoundsException.h"
+#include "sbuf/SBuf.h"
 #include "sbuf/Exceptions.h"
 
 OutOfBoundsException::OutOfBoundsException(const SBuf &throwingBuf,

diff --git a/src/sbuf/SBuf.cc b/src/sbuf/SBuf.cc
index 75cd9d7f3af1d415ebdbc6051383392bc096f567..ae1d1f05c27f3c5785582b50945c24331b45034e 100644 (file)
--- a/src/sbuf/SBuf.cc
+++ b/src/sbuf/SBuf.cc
@@ -10,8 +10,8 @@
 #include "base/CharacterSet.h"
 #include "base/RefCount.h"
 #include "Debug.h"
-#include "OutOfBoundsException.h"
-#include "SBuf.h"
+#include "sbuf/OutOfBoundsException.h"
+#include "sbuf/SBuf.h"
 #include "sbuf/DetailedStats.h"
 #include "sbuf/Exceptions.h"
 #include "util.h"

diff --git a/src/sbuf/SBufList.cc b/src/sbuf/SBufList.cc
index a128d62993eba2e8aa265f28d259c70335b57d79..2c871836466a4b3e5728100b2df55095ad7dfe29 100644 (file)
--- a/src/sbuf/SBufList.cc
+++ b/src/sbuf/SBufList.cc
@@ -8,7 +8,7 @@
 
 #include "squid.h"
 #include "sbuf/Algorithms.h"
-#include "SBufList.h"
+#include "sbuf/SBufList.h"
 
 bool
 IsMember(const SBufList & sl, const SBuf &S, const SBufCaseSensitive case_sensitive)

diff --git a/src/sbuf/SBufList.h b/src/sbuf/SBufList.h
index d29879aa922aa9d37434ca36e80063723bffb263..68babba2a958edee90b12c9ac8b34f70e7469055 100644 (file)
--- a/src/sbuf/SBufList.h
+++ b/src/sbuf/SBufList.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFLIST_H
 #define SQUID_SBUFLIST_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <list>
 

diff --git a/src/sbuf/SBufStream.h b/src/sbuf/SBufStream.h
index ce944fc710ad1ae49621cb67fcafb1c47f254a44..1eeaf8f2f8beaadd7eee01bfbb7437774636dd34 100644 (file)
--- a/src/sbuf/SBufStream.h
+++ b/src/sbuf/SBufStream.h
@@ -9,7 +9,7 @@
 #ifndef SQUID_SBUFSTREAM_H
 #define SQUID_SBUFSTREAM_H
 
-#include "SBuf.h"
+#include "sbuf/SBuf.h"
 
 #include <ostream>