Fixed some compilation problems caught by Tsantilas Christos.

diff --git a/src/SquidString.h b/src/SquidString.h
index d97f37b83c4576cc3b86ce5678f4350afe73dee1..c05c98f4d539d500031ce8f004a315d527b03164 100644 (file)
--- a/src/SquidString.h
+++ b/src/SquidString.h
@@ -95,7 +95,7 @@ public:
      * Retrieve a single character in the string.
      \param pos        Position of character to retrieve.
      */
-    _SQUID_INLINE_ char operator [](unsigned int pos);
+    _SQUID_INLINE_ char operator [](unsigned int pos) const;
 
     _SQUID_INLINE_ int size() const;
     _SQUID_INLINE_ char const * unsafeBuf() const;

diff --git a/src/String.cci b/src/String.cci
index e6f02fc5687446f6c28036e062867a2209413035..bd97323d99f35c7e7a932e354b54a2f9dd0ead18 100644 (file)
--- a/src/String.cci
+++ b/src/String.cci
@@ -77,7 +77,7 @@ String::termedBuf() const
 }
 
 char
-String::operator [](unsigned int pos)
+String::operator [](unsigned int pos) const
 {
     assert(pos < size_);
 

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 21184c43e950a3d36e80a95a7f40ef99f9e030e7..e49ed3ddba3fbaad4dcf1f7dc271a95169fde83a 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1400,13 +1400,13 @@ ClientHttpRequest::noteMoreBodyDataAvailable(BodyPipe::Pointer)
     assert(request_satisfaction_mode);
     assert(adaptedBodySource != NULL);
 
-    if (const size_t contentSize = adaptedBodySource->unsafeBuf().contentSize()) {
+    if (const size_t contentSize = adaptedBodySource->buf().contentSize()) {
         BodyPipeCheckout bpc(*adaptedBodySource);
-        const StoreIOBuffer ioBuf(&bpc.unsafeBuf, request_satisfaction_offset);
+        const StoreIOBuffer ioBuf(&bpc.buf, request_satisfaction_offset);
         storeEntry()->write(ioBuf);
         // assume can write everything
         request_satisfaction_offset += contentSize;
-        bpc.unsafeBuf.consume(contentSize);
+        bpc.buf.consume(contentSize);
         bpc.checkIn();
     }