Moved CharacterSet as forward-declaration in SBuf.h

diff --git a/src/SBuf.cc b/src/SBuf.cc
index 18053bd734628f16ff33cad83d84db88308c8383..819a4d54de5b96b5b9f901a382fe553a86cb3414 100644 (file)
--- a/src/SBuf.cc
+++ b/src/SBuf.cc
@@ -27,6 +27,7 @@
  */
 
 #include "squid.h"
+#include "base/CharacterSet.h"
 #include "base/RefCount.h"
 #include "Debug.h"
 #include "OutOfBoundsException.h"

diff --git a/src/SBuf.h b/src/SBuf.h
index 3fcf9f1869154a29c4b5a63cf02a9019cd4990e9..49e480222fbdc272bb88caead260639f49490d75 100644 (file)
--- a/src/SBuf.h
+++ b/src/SBuf.h
@@ -29,7 +29,6 @@
 #ifndef SQUID_SBUF_H
 #define SQUID_SBUF_H
 
-#include "base/CharacterSet.h"
 #include "base/InstanceId.h"
 #include "MemBlob.h"
 #include "SBufExceptions.h"
@@ -102,6 +101,8 @@ public:
     SBufStats& operator +=(const SBufStats&);
 };
 
+class CharacterSet;
+
 /**
  * A String or Buffer.
  * Features: refcounted backing store, cheap copy and sub-stringing

diff --git a/src/tests/SBufFindTest.cc b/src/tests/SBufFindTest.cc
index 247b5a51644ba4d04e2f60fcd5db1d4ed0a6ee98..e133fa6d6b2f2600bce2cb190b3f5256e04d0790 100644 (file)
--- a/src/tests/SBufFindTest.cc
+++ b/src/tests/SBufFindTest.cc
@@ -1,4 +1,5 @@
 #include "squid.h"
+#include "base/CharacterSet.h"
 #include "SBufFindTest.h"
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/Message.h>

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index bc9b56efa287d2adc9c7f3bc9236ac3b4f878113..32b4d8eadae6babef638b800a5f4be692a13539c 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -1,4 +1,5 @@
 #include "squid.h"
+#include "base/CharacterSet.h"
 #include "Mem.h"
 #include "SBuf.h"
 #include "SBufFindTest.h"