diff options
| author | Anatol Belski <ab@php.net> | 2020-02-08 10:18:08 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2020-02-08 10:18:08 +0100 |
| commit | 538c088a82d13832d25c757fc14c4b8cf05a89a7 (patch) | |
| tree | 740da20842ff237df94606a56c44e0160f910961 | |
| parent | 78b71e1e8f32b8d6282b84a5814d43dd47d1650f (diff) | |
| parent | 34bab6c9fcf0305a6c15ce3f8b8f26c55a015a62 (diff) | |
| download | php-git-538c088a82d13832d25c757fc14c4b8cf05a89a7.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Update bundled stdxx check macros
| -rw-r--r-- | build/php_cxx_compile_stdcxx.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/php_cxx_compile_stdcxx.m4 b/build/php_cxx_compile_stdcxx.m4 index 8005721c05..3c8d598e63 100644 --- a/build/php_cxx_compile_stdcxx.m4 +++ b/build/php_cxx_compile_stdcxx.m4 @@ -87,6 +87,7 @@ dnl # Copyright (c) 2015 Paul Norman <penorman@mac.com> # Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> # Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com> +# Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice @@ -149,11 +150,13 @@ namespace cxx11 struct Base { + virtual ~Base() {} virtual void f() {} }; struct Derived : public Base { + virtual ~Derived() override {} virtual void f() override {} }; |