summaryrefslogtreecommitdiff
path: root/zen/dst_hack.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
commit88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 (patch)
treec6c5babb49b90293380106b81ae5c446959ac70f /zen/dst_hack.cpp
parent5.3 (diff)
downloadFreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.gz
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.bz2
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.zip
5.4
Diffstat (limited to 'zen/dst_hack.cpp')
-rw-r--r--zen/dst_hack.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/zen/dst_hack.cpp b/zen/dst_hack.cpp
index 9457b966..6e5c2230 100644
--- a/zen/dst_hack.cpp
+++ b/zen/dst_hack.cpp
@@ -2,7 +2,7 @@
#include <bitset>
#include "basic_math.h"
#include "long_path_prefix.h"
-#include "utf8.h"
+#include "utf.h"
#include "assert_static.h"
#include "int64.h"
#include "file_error.h"
@@ -169,7 +169,7 @@ FILETIME utcToLocal(const FILETIME& utcTime) //throw std::runtime_error
const std::wstring errorMessage = _("Conversion error:") + L" FILETIME -> local FILETIME: " + L"(" +
L"High: " + numberTo<std::wstring>(utcTime.dwHighDateTime) + L" " +
L"Low: " + numberTo<std::wstring>(utcTime.dwLowDateTime) + L") " + L"\n\n" + getLastErrorFormatted();
- throw std::runtime_error(wideToUtf8<std::string>(errorMessage));
+ throw std::runtime_error(utfCvrtTo<std::string>(errorMessage));
}
return localTime;
}
@@ -187,7 +187,7 @@ FILETIME localToUtc(const FILETIME& localTime) //throw std::runtime_error
const std::wstring errorMessage = _("Conversion error:") + L" local FILETIME -> FILETIME: " + L"(" +
L"High: " + numberTo<std::wstring>(localTime.dwHighDateTime) + L" " +
L"Low: " + numberTo<std::wstring>(localTime.dwLowDateTime) + L") " + L"\n\n" + getLastErrorFormatted();
- throw std::runtime_error(wideToUtf8<std::string>(errorMessage));
+ throw std::runtime_error(utfCvrtTo<std::string>(errorMessage));
}
return utcTime;
}
@@ -288,7 +288,7 @@ std::bitset<UTC_LOCAL_OFFSET_BITS> getUtcLocalShift()
{
const std::wstring errorMessage = _("Conversion error:") + L" Unexpected UTC <-> local time shift: " +
L"(" + numberTo<std::wstring>(timeShiftSec) + L") " + L"\n\n" + getLastErrorFormatted();
- throw std::runtime_error(wideToUtf8<std::string>(errorMessage));
+ throw std::runtime_error(utfCvrtTo<std::string>(errorMessage));
}
std::bitset<UTC_LOCAL_OFFSET_BITS> output(absValue);
bgstack15