From 211195e4e1173ddf6452b9b6c3b676684f75a58f Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 23 Apr 2008 13:03:07 +0000
Subject: [PATCH] Fix shadowed variables
git-svn-id: http://root.cern.ch/svn/root/trunk@23458 27541ba8-7e3a-0410-8455-c3a389f83636
---
io/xml/src/TBufferXML.cxx | 10 +++++-----
io/xml/src/TXMLFile.cxx | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/io/xml/src/TBufferXML.cxx b/io/xml/src/TBufferXML.cxx
index 7b60440b5a3..8586a320e6b 100644
--- a/io/xml/src/TBufferXML.cxx
+++ b/io/xml/src/TBufferXML.cxx
@@ -2178,11 +2178,11 @@ void TBufferXML::WriteFastArray(const Char_t *c, Int_t n)
if (usedefault) {
TBufferXML_WriteFastArray(c);
} else {
- Char_t* buf = new Char_t[n+1];
- memcpy(buf, c, n);
- buf[n] = 0;
- XmlWriteValue(buf, xmlio::CharStar);
- delete[] buf;
+ Char_t* buf2 = new Char_t[n+1];
+ memcpy(buf2, c, n);
+ buf2[n] = 0;
+ XmlWriteValue(buf2, xmlio::CharStar);
+ delete[] buf2;
}
}
diff --git a/io/xml/src/TXMLFile.cxx b/io/xml/src/TXMLFile.cxx
index bb78350d7bd..5ee6984ebf7 100644
--- a/io/xml/src/TXMLFile.cxx
+++ b/io/xml/src/TXMLFile.cxx
@@ -701,7 +701,7 @@ void TXMLFile::WriteStreamerInfo()
fStreamerInfoNode = fXML->NewChild(0, 0, xmlio::SInfos);
for (int n=0;n<=list.GetLast();n++) {
- TStreamerInfo* info = (TStreamerInfo*) list.At(n);
+ info = (TStreamerInfo*) list.At(n);
XMLNodePointer_t infonode = fXML->NewChild(fStreamerInfoNode, 0, "TStreamerInfo");
@@ -713,9 +713,9 @@ void TXMLFile::WriteStreamerInfo()
fXML->NewAttr(infonode, 0, "canoptimize", (info->TestBit(TStreamerInfo::kCannotOptimize) ? xmlio::False : xmlio::True));
fXML->NewIntAttr(infonode, "checksum", info->GetCheckSum());
- TIter iter(info->GetElements());
+ TIter iter2(info->GetElements());
TStreamerElement* elem=0;
- while ((elem= (TStreamerElement*) iter()) != 0) {
+ while ((elem= (TStreamerElement*) iter2()) != 0) {
StoreStreamerElement(infonode, elem);
}
}
--
GitLab