summaryrefslogtreecommitdiff
path: root/zen/format_unit.h
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-05-22 21:09:26 +0000
committerB. Stack <bgstack15@gmail.com>2022-05-22 21:09:26 +0000
commit54c2e44d7b37b2c3efc449e054eef21fa414dfde (patch)
tree3894ba7e10c78750c195381a861da5e8166a6bfd /zen/format_unit.h
parentMerge branch 'b11.20' into 'master' (diff)
parentadd upstream 11.21 (diff)
downloadFreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.gz
FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.tar.bz2
FreeFileSync-54c2e44d7b37b2c3efc449e054eef21fa414dfde.zip
Merge branch 'b11.21' into 'master'11.21
add upstream 11.21 See merge request opensource-tracking/FreeFileSync!44
Diffstat (limited to 'zen/format_unit.h')
-rw-r--r--zen/format_unit.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/zen/format_unit.h b/zen/format_unit.h
index 72a5e91b..d1ebc28c 100644
--- a/zen/format_unit.h
+++ b/zen/format_unit.h
@@ -8,8 +8,9 @@
#define FMT_UNIT_8702184019487324
#include <string>
-#include <cstdint>
-#include "string_tools.h"
+#include <optional>
+//#include <cstdint>
+//#include "string_tools.h"
namespace zen
bgstack15