diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-05-12 22:44:22 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-05-12 22:44:22 +0000 |
| commit | 2cb4599782d970f386a67dfd4f4dab0d531d4348 (patch) | |
| tree | b873b15f50a981aacf8bb49fd646bfded2e7a73b /zen/zstring.h | |
| parent | Merge branch '10.11' into 'master' (diff) | |
| parent | 10.12 (diff) | |
| download | FreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.tar.gz FreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.tar.bz2 FreeFileSync-2cb4599782d970f386a67dfd4f4dab0d531d4348.zip | |
Merge branch '10.12' into 'master'10.12
10.12
See merge request opensource-tracking/FreeFileSync!9
Diffstat (limited to 'zen/zstring.h')
| -rw-r--r-- | zen/zstring.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/zen/zstring.h b/zen/zstring.h index 42487670..d5a8c29b 100644 --- a/zen/zstring.h +++ b/zen/zstring.h @@ -66,7 +66,7 @@ struct LessNativePath { bool operator()(const Zstring& lhs, const Zstring& rhs) //------------------------------------------------------------------------------------------ int compareNatural(const Zstring& lhs, const Zstring& rhs); -struct LessNaturalSort { bool operator()(const Zstring& lhs, const Zstring rhs) const { return compareNatural(lhs, rhs) < 0; } }; +struct LessNaturalSort { bool operator()(const Zstring& lhs, const Zstring& rhs) const { return compareNatural(lhs, rhs) < 0; } }; //------------------------------------------------------------------------------------------ @@ -148,4 +148,8 @@ const wchar_t MULT_SIGN = L'\u00D7'; //fancy "x" //ZEN macro consistency checks: +#if defined ZEN_WIN_PRE_VISTA || defined ZEN_WIN_VISTA_AND_LATER + #error these macros are obsolete! +#endif + #endif //ZSTRING_H_73425873425789 |