diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-09-18 20:58:33 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-09-18 20:58:33 +0200 |
| commit | 66d205834c9ebde5a740298d6d7d1c171c50a4a5 (patch) | |
| tree | 0090e94ce13cb97617cb10bb410b3ef255b6909d /vespalib | |
| parent | abac32218be6c4cf361d38762e0f97b4e6807b0e (diff) | |
Remove ifdefs for g++ version older than g++ 10.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/stllike/string.h | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/testkit/test_master.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/stllike/string.h b/vespalib/src/vespa/vespalib/stllike/string.h index 7bf03895a88..73b91de883d 100644 --- a/vespalib/src/vespa/vespalib/stllike/string.h +++ b/vespalib/src/vespa/vespalib/stllike/string.h @@ -654,7 +654,7 @@ template<uint32_t StackSize> small_string<StackSize> operator + (const char * a, const small_string<StackSize> & b); -#if __cplusplus < 201709L || (!defined(__clang__) && defined(__GNUC__) && __GNUC__ < 10) +#if __cplusplus < 201709L template<typename T, uint32_t StackSize> bool operator == (const T& a, const small_string<StackSize>& b) noexcept diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.hpp b/vespalib/src/vespa/vespalib/testkit/test_master.hpp index 7d9b2e1fddc..f2724731bee 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.hpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.hpp @@ -4,7 +4,7 @@ namespace vespalib { -#if (!defined(__clang__) && defined(__GNUC__) && __GNUC__ < 9) || (defined(__clang__) && defined(__apple_build_version__)) +#if defined(__clang__) && defined(__apple_build_version__) // cf. https://cplusplus.github.io/LWG/issue2221 template<class charT, class traits> std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>& os, std::nullptr_t) |