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)
This commit is contained in:
Michael Gmelin 2014-11-04 17:49:16 +00:00
parent e31de1153b
commit 0ea2df7e0c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372159
2 changed files with 21 additions and 1 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= Ice PORTNAME= Ice
PORTVERSION= 3.5.1 PORTVERSION= 3.5.1
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://download.zeroc.com/Ice/3.5/ MASTER_SITES= http://download.zeroc.com/Ice/3.5/

View file

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