diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:07 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:07 +0200 |
| commit | 88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 (patch) | |
| tree | c6c5babb49b90293380106b81ae5c446959ac70f /zen/zstring.h | |
| parent | 5.3 (diff) | |
| download | FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.gz FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.bz2 FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.zip | |
5.4
Diffstat (limited to 'zen/zstring.h')
| -rw-r--r-- | zen/zstring.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/zen/zstring.h b/zen/zstring.h index 8f7486b0..94d5b1a4 100644 --- a/zen/zstring.h +++ b/zen/zstring.h @@ -104,7 +104,7 @@ template <template <class, class> class SP, class AP> void makeUpper(zen::Zbase<wchar_t, SP, AP>& str); #endif -#ifdef FFS_WIN //Windows stores filenames in wide character format +#ifdef FFS_WIN //Windows encodes Unicode as UTF-16 wchar_t typedef wchar_t Zchar; #define Zstr(x) L ## x const Zchar FILE_NAME_SEPARATOR = L'\\'; @@ -157,8 +157,7 @@ void makeUpperCaseWin(wchar_t* str, size_t size); } -template <class T, template <class, class> class SP, class AP> -inline +template <class T, template <class, class> class SP, class AP> inline int cmpFileName(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbase<T, SP, AP>& rhs) { #ifdef FFS_WIN @@ -169,8 +168,7 @@ int cmpFileName(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbase<T, SP, AP>& r } -template <class T, template <class, class> class SP, class AP> -inline +template <class T, template <class, class> class SP, class AP> inline bool LessFilename::operator()(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbase<T, SP, AP>& rhs) const { #ifdef FFS_WIN @@ -181,8 +179,7 @@ bool LessFilename::operator()(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbase } -template <class T, template <class, class> class SP, class AP> -inline +template <class T, template <class, class> class SP, class AP> inline bool EqualFilename::operator()(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbase<T, SP, AP>& rhs) const { #ifdef FFS_WIN @@ -195,8 +192,7 @@ bool EqualFilename::operator()(const zen::Zbase<T, SP, AP>& lhs, const zen::Zbas #ifdef FFS_WIN -template <template <class, class> class SP, class AP> -inline +template <template <class, class> class SP, class AP> inline void makeUpper(zen::Zbase<wchar_t, SP, AP>& str) { z_impl::makeUpperCaseWin(str.begin(), str.length()); |