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

Merge branch 'PHP-7.1'

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

46ef3e237c1c51a558b2f892ad526016614aff00