diff options
| author | B Stack <bgstack15@gmail.com> | 2020-10-03 01:04:14 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-10-03 01:04:14 +0000 |
| commit | 0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c (patch) | |
| tree | d8a89392817379e3036c42eedebf33d4fb372dfd /zen/string_base.h | |
| parent | Merge branch '11.1' into 'master' (diff) | |
| parent | add upstream 11.2 (diff) | |
| download | FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.gz FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.bz2 FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.zip | |
Merge branch '11.2' into 'master'11.2
add upstream 11.2
See merge request opensource-tracking/FreeFileSync!26
Diffstat (limited to 'zen/string_base.h')
| -rw-r--r-- | zen/string_base.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/zen/string_base.h b/zen/string_base.h index 1052de56..f0899433 100644 --- a/zen/string_base.h +++ b/zen/string_base.h @@ -10,7 +10,7 @@ #include <algorithm> #include <atomic> #include "string_tools.h" - +#include "legacy_compiler.h" //constinit2 //Zbase - a policy based string class optimizing performance and flexibility @@ -312,7 +312,6 @@ template <class Char, template <class> class SP> std::strong_ordering operator<= template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Char* rhs); template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs); - template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return Zbase<Char, SP>(lhs) += rhs; } template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Char* rhs) { return Zbase<Char, SP>(lhs) += rhs; } template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, Char rhs) { return Zbase<Char, SP>(lhs) += rhs; } @@ -515,7 +514,6 @@ std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs) } - template <class Char, template <class> class SP> inline size_t Zbase<Char, SP>::length() const { |