diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-06 22:34:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 22:34:45 +0200 |
| commit | 6c9ec499d0c00385220c275361e4b1fc0ff99aa6 (patch) | |
| tree | 1baa3ed62627cb26ebfbf7c584ebd6d0bd96f80f | |
| parent | d42f89d160cd0419e96bc7880fa6c8f6e2e6df24 (diff) | |
| parent | 3e12105d8bca3ca77a40643d5841279a965eb7d7 (diff) | |
Merge pull request #14743 from vespa-engine/toregge/darwin-needs-std-nullptr-workaround-when-using-appleclang
Darwin needs std::nullptr_t workaround when using AppleClang.
| -rw-r--r-- | vespalib/src/vespa/vespalib/testkit/test_master.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.hpp b/vespalib/src/vespa/vespalib/testkit/test_master.hpp index 8a5f7eb337b..f165458c9aa 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.hpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.hpp @@ -4,10 +4,10 @@ namespace vespalib { -#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 9 +#if (!defined(__clang__) && defined(__GNUC__) && __GNUC__ < 9) || (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, nullptr_t) +std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>& os, std::nullptr_t) { return os << (void*) nullptr; } |