svn commit: r372159 - in head/devel/ice: . files

[Michael Gmelin]

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)
+                 {