Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5F257200CEF for ; Mon, 4 Sep 2017 09:27:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5DB99163FB7; Mon, 4 Sep 2017 07:27:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CC2B3163F92 for ; Mon, 4 Sep 2017 09:26:59 +0200 (CEST) Received: (qmail 69744 invoked by uid 500); 4 Sep 2017 07:26:58 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 69734 invoked by uid 99); 4 Sep 2017 07:26:58 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2017 07:26:58 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0E1D1816ED; Mon, 4 Sep 2017 07:26:56 +0000 (UTC) Date: Mon, 04 Sep 2017 07:26:56 +0000 To: "commits@geode.apache.org" Subject: [geode-native] branch develop updated: GEODE-3442: Fixes patch mismatch on Solaris. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150451001630.31014.17506138228167224034@gitbox.apache.org> From: jbarrett@apache.org Reply-To: "commits@geode.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: geode-native X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 69109ffc16270585ff77abe90d559d06ece86c8b X-Git-Newrev: 9dbf93dfc05e7cd4a4b94c7f6a6010c368e07632 X-Git-Rev: 9dbf93dfc05e7cd4a4b94c7f6a6010c368e07632 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Mon, 04 Sep 2017 07:27:00 -0000 This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git The following commit(s) were added to refs/heads/develop by this push: new 9dbf93d GEODE-3442: Fixes patch mismatch on Solaris. 9dbf93d is described below commit 9dbf93dfc05e7cd4a4b94c7f6a6010c368e07632 Author: Jacob Barrett AuthorDate: Mon Sep 4 00:26:00 2017 -0700 GEODE-3442: Fixes patch mismatch on Solaris. --- dependencies/ACE/patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/ACE/patches b/dependencies/ACE/patches index 7309784..d755bcd 100644 --- a/dependencies/ACE/patches +++ b/dependencies/ACE/patches @@ -4,7 +4,7 @@ diff -ru a/ace/config-lite.h b/ace/config-lite.h @@ -115,7 +115,8 @@ // adapters, we can drop this generator macro or at least drop the // MSVC++ or Sun Studio preprocessor conditional blocks. - #if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5130 \ + #if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && !defined (_STLPORT_VERSION) + && !defined (_STLPORT_VERSION) \ + && __cplusplus < 201103L -- To stop receiving notification emails like this one, please contact ['"commits@geode.apache.org" '].