From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 29 Feb 2016 10:33:39 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: SQUID_4_0_8~51^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=062929304a64269a486541ec644f2cf83d20698d;p=thirdparty%2Fsquid.git

Merged from trunk
---

062929304a64269a486541ec644f2cf83d20698d
diff --cc src/sbuf/Makefile.am
index d7e914dd0e,e42c1e29b7..b2d1392c28
--- a/src/sbuf/Makefile.am
+++ b/src/sbuf/Makefile.am
@@@ -16,12 -16,14 +16,14 @@@ libsbuf_la_SOURCES = 
  	OutOfBoundsException.h \
  	SBuf.cc \
  	SBuf.h \
 -	SBufAlgos.cc \
 -	SBufAlgos.h \
 -	SBufDetailedStats.cc \
 -	SBufDetailedStats.h \
 -	SBufExceptions.cc \
 -	SBufExceptions.h \
 +	Algorithms.cc \
 +	Algorithms.h \
 +	DetailedStats.cc \
 +	DetailedStats.h \
 +	Exceptions.cc \
 +	Exceptions.h \
  	SBufList.cc \
  	SBufList.h \
- 	SBufStream.h
+ 	SBufStream.h \
+ 	Stats.cc \
+ 	Stats.h
diff --cc src/sbuf/SBuf.h
index 0266e396da,b0aa872d28..b9733dc033
--- a/src/sbuf/SBuf.h
+++ b/src/sbuf/SBuf.h
@@@ -15,7 -15,8 +15,8 @@@
  #include "Debug.h"
  #include "globals.h"
  #include "sbuf/MemBlob.h"
+ #include "sbuf/Stats.h"
 -#include "SBufExceptions.h"
 +#include "sbuf/Exceptions.h"
  
  #include <climits>
  #include <cstdarg>