From owner-svn-ports-head@FreeBSD.ORG  Tue Nov  4 17:49:18 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1A0E0995;
 Tue,  4 Nov 2014 17:49:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFF433EF;
 Tue,  4 Nov 2014 17:49:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4HnHZ9009259;
 Tue, 4 Nov 2014 17:49:17 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4HnHvm009254;
 Tue, 4 Nov 2014 17:49:17 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201411041749.sA4HnHvm009254@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Tue, 4 Nov 2014 17:49:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372159 - in head/devel/ice: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2014 17:49:18 -0000

Author: grembo
Date: Tue Nov  4 17:49:16 2014
New Revision: 372159
URL: https://svnweb.freebsd.org/changeset/ports/372159
QAT: https://qat.redports.org/buildarchive/r372159/

Log:
  Remove shadowed variables from header.
  
  See also http://www.zeroc.com/forums/patches/6336-minor-patch-basicstream-h-remove-shadowed-variables.html
  
  Approved by:	mentors (implicit)

Added:
  head/devel/ice/files/patch-cpp-include-Ice-Basicstream.h   (contents, props changed)
Modified:
  head/devel/ice/Makefile

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Tue Nov  4 17:45:53 2014	(r372158)
+++ head/devel/ice/Makefile	Tue Nov  4 17:49:16 2014	(r372159)
@@ -3,7 +3,7 @@
 
 PORTNAME=		Ice
 PORTVERSION=		3.5.1
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://download.zeroc.com/Ice/3.5/
 

Added: head/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-Ice-Basicstream.h	Tue Nov  4 17:49:16 2014	(r372159)
@@ -0,0 +1,20 @@
+--- cpp/include/Ice/BasicStream.h.orig	2014-11-04 18:12:19.183757485 +0100
++++ cpp/include/Ice/BasicStream.h	2014-11-04 18:13:37.223886887 +0100
+@@ -964,7 +964,7 @@
+ 
+         struct InstanceData
+         {
+-            InstanceData(InstanceData* previous) : previous(previous), next(0)
++            InstanceData(InstanceData* prev) : previous(prev), next(0)
+             {
+                 if(previous)
+                 {
+@@ -1123,7 +1123,7 @@
+ 
+         struct InstanceData
+         {
+-            InstanceData(InstanceData* previous) : previous(previous), next(0)
++            InstanceData(InstanceData* prev) : previous(prev), next(0)
+             {
+                 if(previous)
+                 {