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

Merge branch 'PHP-7.1'

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

04d7595e58ed13c0c25d190e2a91c3d6a3d031ab