From 517fc64cd31f9f4c4e353173d086889f866e2a50 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Mon, 29 Feb 2016 11:11:37 +0100 Subject: [PATCH] Rename some files in sbuf/ and apply include paths consistently --- src/sbuf/Algorithms.cc | 2 +- src/sbuf/Algorithms.h | 2 +- src/sbuf/Exceptions.cc | 4 ++-- src/sbuf/SBuf.cc | 4 ++-- src/sbuf/SBufList.cc | 2 +- src/sbuf/SBufList.h | 2 +- src/sbuf/SBufStream.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/sbuf/Algorithms.cc b/src/sbuf/Algorithms.cc index 9343647848..8f2fae8601 100644 --- 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 8655db0707..e65284851a 100644 --- 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 #include diff --git a/src/sbuf/Exceptions.cc b/src/sbuf/Exceptions.cc index 21d03ab3a7..2c7a4ef7e1 100644 --- 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 75cd9d7f3a..ae1d1f05c2 100644 --- 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 a128d62993..2c87183646 100644 --- 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 d29879aa92..68babba2a9 100644 --- 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 diff --git a/src/sbuf/SBufStream.h b/src/sbuf/SBufStream.h index ce944fc710..1eeaf8f2f8 100644 --- 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 -- 2.47.2