From 0ea2df7e0ca1d4c20cf68e0db0c9edfde56f17f4 Mon Sep 17 00:00:00 2001
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Tue, 4 Nov 2014 17:49:16 +0000
Subject: [PATCH] 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)
---
 devel/ice/Makefile                            |  2 +-
 .../files/patch-cpp-include-Ice-Basicstream.h | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 devel/ice/files/patch-cpp-include-Ice-Basicstream.h

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 9138cfc90b94..c38b4481a817 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -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/
 
diff --git a/devel/ice/files/patch-cpp-include-Ice-Basicstream.h b/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
new file mode 100644
index 000000000000..e9832fe1132e
--- /dev/null
+++ b/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
@@ -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)
+                 {