Merge branch 'PHP-7.4'

weltling · weltling · commit 538c088a82d1 · 2020-02-08T10:18:08.000+01:00
* PHP-7.4:
  Update bundled stdxx check macros
diff --git 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 {}
     };
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ dnl`
`87`	`87`	`# Copyright (c) 2015 Paul Norman <[email protected]>`
`88`	`88`	`# Copyright (c) 2015 Moritz Klammler <[email protected]>`
`89`	`89`	`# Copyright (c) 2016, 2018 Krzesimir Nowak <[email protected]>`
	`90`	`+# Copyright (c) 2019 Enji Cooper <[email protected]>`
`90`	`91`	`#`
`91`	`92`	`# Copying and distribution of this file, with or without modification, are`
`92`	`93`	`# permitted in any medium without royalty provided the copyright notice`
`@@ -149,11 +150,13 @@ namespace cxx11`
`149`	`150`
`150`	`151`	`struct Base`
`151`	`152`	`{`
	`153`	`+ virtual ~Base() {}`
`152`	`154`	`virtual void f() {}`
`153`	`155`	`};`
`154`	`156`
`155`	`157`	`struct Derived : public Base`
`156`	`158`	`{`
	`159`	`+ virtual ~Derived() override {}`
`157`	`160`	`virtual void f() override {}`
`158`	`161`	`};`
`159`	`162`