diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
| commit | 728d32e6da9ce66968f8eef47a59505d613e2c1b (patch) | |
| tree | 0f0441755ff0e6d65e12222d4502c648bffd6a7c /zen/ring_buffer.h | |
| parent | 10.3 (diff) | |
| parent | pull in latest 10.4 from upstream (diff) | |
| download | FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.gz FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.bz2 FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.zip | |
Merge branch '10.4' into 'master'10.4
pull in latest 10.4 from upstream
See merge request opensource-tracking/FreeFileSync!1
Diffstat (limited to 'zen/ring_buffer.h')
| -rwxr-xr-x | zen/ring_buffer.h | 2 |
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 |