From: Anatol Belski <ab@php.net>
Date: Sat, 1 Jul 2017 18:06:39 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d1575c4956cd0018ae0a8f7f393600a1de1f05a;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  yet one C++ compat fix
---

9d1575c4956cd0018ae0a8f7f393600a1de1f05a