summaryrefslogtreecommitdiff
path: root/zen/ring_buffer.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-09-09 18:53:23 -0400
committerB Stack <bgstack15@gmail.com>2018-09-09 18:53:23 -0400
commiteb5d3e5df99de2c3d8da2e8bc7b12ed427465dba (patch)
tree0f0441755ff0e6d65e12222d4502c648bffd6a7c /zen/ring_buffer.h
parent10.3 (diff)
downloadFreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.tar.gz
FreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.tar.bz2
FreeFileSync-eb5d3e5df99de2c3d8da2e8bc7b12ed427465dba.zip
pull in latest 10.4 from upstream
Diffstat (limited to 'zen/ring_buffer.h')
-rwxr-xr-xzen/ring_buffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/ring_buffer.h b/zen/ring_buffer.h
index 6debd84e..232e17da 100755
--- a/zen/ring_buffer.h
+++ b/zen/ring_buffer.h
@@ -10,8 +10,8 @@
#include <cassert>
#include <vector>
#include <stdexcept>
-#include "type_traits.h"
#include "scope_guard.h"
+#include "string_tools.h"
namespace zen
bgstack15