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

Merge branch 'PHP-7.0' into PHP-7.1

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

667185a26441220d323b0d3f5517026dd49a1d92