Eliminated numerous warnings from Sun C++ 5.4 builds

44 files changed, 283 insertions, 274 deletions

diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index cd269fa88cd..75490ce00ec 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -94,6 +94,8 @@ private:
 
 static DBEnvironmentMap _dbEnvMap;
 
+extern "C"
+{
 static void
 FreezeErrCallFcn(const char* prefix, char* msg)
 {
@@ -103,6 +105,7 @@ FreezeErrCallFcn(const char* prefix, char* msg)
     Error out(dbEnv->getCommunicator()->getLogger());
     out << "Freeze database error: " << dbEnv->getName() << ": " << msg;
 }
+}
 
 void
 Freeze::checkBerkeleyDBReturn(int ret, const string& prefix, const string& op)
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index 69b06ee6ffb..e440f823c26 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -283,8 +283,8 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 	// Load the Ice object from the database and add a
         // servant for it.
 	//
-	IdentityObjectRecordDict::iterator p = _dict.find(current.id);
-	if(p == _dict.end())
+	IdentityObjectRecordDict::iterator q = _dict.find(current.id);
+	if(q == _dict.end())
 	{
 	    //
             // The Ice object with the given identity does not exist,
@@ -298,13 +298,13 @@ Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie)
 	//
 	if(_initializer)
 	{
-	    _initializer->initialize(current.adapter, current.id, p->second.servant);
+	    _initializer->initialize(current.adapter, current.id, q->second.servant);
 	}
 
 	//
 	// Add the new servant to the evictor queue.
 	//
-	element = add(current.id, p->second);
+	element = add(current.id, q->second);
     }
 
     //
diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp
index ccd4f342b77..7ef036857cc 100644
--- a/cpp/src/Glacier/GlacierStarter.cpp
+++ b/cpp/src/Glacier/GlacierStarter.cpp
@@ -164,11 +164,14 @@ Glacier::RouterApp::run(int argc, char* argv[])
     return EXIT_SUCCESS;
 }
 
+extern "C"
+{
 static void
 childHandler(int)
 {
     wait(0);
 }
+}
 
 int
 main(int argc, char* argv[])
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index c9956a43bb1..4f3414ac270 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -296,9 +296,9 @@ IceInternal::BasicStream::writeSize(Int v)
 void
 IceInternal::BasicStream::readSize(Ice::Int& v)
 {
-    Byte b;
-    read(b);
-    if(b < 0)
+    Byte byte;
+    read(byte);
+    if(byte < 0)
     {
 	read(v);
 	if(v < 0)
@@ -308,7 +308,7 @@ IceInternal::BasicStream::readSize(Ice::Int& v)
     }
     else
     {
-	v = static_cast<Int>(b);
+	v = static_cast<Int>(byte);
     }
 }
 
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index e14ecf34294..919f9d5a570 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -543,7 +543,6 @@ IceInternal::Connection::sendAsyncRequest(const OutgoingAsyncPtr& out)
 	    //
 	    // No compression, just fill in the message size.
 	    //
-	    const Byte* p;
 	    Int sz = os->b.size();
 	    p = reinterpret_cast<const Byte*>(&sz);
 #ifdef ICE_BIG_ENDIAN
@@ -701,7 +700,6 @@ IceInternal::Connection::flushBatchRequest()
 	    //
 	    // No compression, just fill in the message size.
 	    //
-	    const Byte* p;
 	    Int sz = _batchStream.b.size();
 	    p = reinterpret_cast<const Byte*>(&sz);
 
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index ea5086b930f..11554df23af 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -281,7 +281,6 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpts
 	// Signal other threads that we are done with trying to
 	// establish connections to our endpoints.
 	//
-	vector<EndpointPtr>::const_iterator q;
 	for(q = endpoints.begin(); q != endpoints.end(); ++q)
 	{
 	    _pending.erase(*q);
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 1f838c8de96..acee6758900 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -538,7 +538,7 @@ repeatAccept:
 	if(wouldBlock())
 	{
 	repeatSelect:
-	    int ret;
+	    int rs;
 	    fd_set fdSet;
 	    FD_ZERO(&fdSet);
 	    FD_SET(fd, &fdSet);
@@ -547,14 +547,14 @@ repeatAccept:
 		struct timeval tv;
 		tv.tv_sec = timeout / 1000;
 		tv.tv_usec = (timeout - tv.tv_sec * 1000) * 1000;
-		ret = ::select(fd + 1, 0, &fdSet, 0, &tv);
+		rs = ::select(fd + 1, 0, &fdSet, 0, &tv);
 	    }
 	    else
 	    {
-		ret = ::select(fd + 1, 0, &fdSet, 0, 0);
+		rs = ::select(fd + 1, 0, &fdSet, 0, 0);
 	    }
 	    
-	    if(ret == SOCKET_ERROR)
+	    if(rs == SOCKET_ERROR)
 	    {
 		if(interrupted())
 		{
@@ -566,7 +566,7 @@ repeatAccept:
 		throw ex;
 	    }
 	    
-	    if(ret == 0)
+	    if(rs == 0)
 	    {
 		throw TimeoutException(__FILE__, __LINE__);
 	    }
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 38d9bf3c26a..bffa4b46929 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -599,11 +599,11 @@ IceInternal::Reference::changeCollocationOptimization(bool newCollocationOptimiz
 ReferencePtr
 IceInternal::Reference::changeDefault() const
 {
-    RouterInfoPtr routerInfo = instance->routerManager()->get(instance->referenceFactory()->getDefaultRouter());
-    LocatorInfoPtr locatorInfo = instance->locatorManager()->get(instance->referenceFactory()->getDefaultLocator());
+    RouterInfoPtr defaultRouterInfo = instance->routerManager()->get(instance->referenceFactory()->getDefaultRouter());
+    LocatorInfoPtr defaultLocatorInfo = instance->locatorManager()->get(instance->referenceFactory()->getDefaultLocator());
 
     return instance->referenceFactory()->create(identity, FacetPath(), ModeTwoway, false, adapterId,
-						endpoints, routerInfo, locatorInfo, 0, true);
+						endpoints, defaultRouterInfo, defaultLocatorInfo, 0, true);
 }
 
 IceInternal::Reference::Reference(const InstancePtr& inst,
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index eaf46722700..79aff442209 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -103,7 +103,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 	    {
 	    repeatSelect:
 
-		int ret;
+		int rs;
 		assert(_fd != INVALID_SOCKET);
 		FD_SET(_fd, &_wFdSet);
 
@@ -112,14 +112,14 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 		    struct timeval tv;
 		    tv.tv_sec = timeout / 1000;
 		    tv.tv_usec = (timeout - tv.tv_sec * 1000) * 1000;
-		    ret = ::select(_fd + 1, 0, &_wFdSet, 0, &tv);
+		    rs = ::select(_fd + 1, 0, &_wFdSet, 0, &tv);
 		}
 		else
 		{
-		    ret = ::select(_fd + 1, 0, &_wFdSet, 0, 0);
+		    rs = ::select(_fd + 1, 0, &_wFdSet, 0, 0);
 		}
 		
-		if(ret == SOCKET_ERROR)
+		if(rs == SOCKET_ERROR)
 		{
 		    if(interrupted())
 		    {
@@ -131,7 +131,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 		    throw ex;
 		}
 		
-		if(ret == 0)
+		if(rs == 0)
 		{
 		    throw TimeoutException(__FILE__, __LINE__);
 		}
@@ -207,7 +207,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 	    {
 	    repeatSelect:
 
-		int ret;
+		int rs;
 		assert(_fd != INVALID_SOCKET);
 		FD_SET(_fd, &_rFdSet);
 
@@ -216,14 +216,14 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 		    struct timeval tv;
 		    tv.tv_sec = timeout / 1000;
 		    tv.tv_usec = (timeout - tv.tv_sec * 1000) * 1000;
-		    ret = ::select(_fd + 1, &_rFdSet, 0, 0, &tv);
+		    rs = ::select(_fd + 1, &_rFdSet, 0, 0, &tv);
 		}
 		else
 		{
-		    ret = ::select(_fd + 1, &_rFdSet, 0, 0, 0);
+		    rs = ::select(_fd + 1, &_rFdSet, 0, 0, 0);
 		}
 		
-		if(ret == SOCKET_ERROR)
+		if(rs == SOCKET_ERROR)
 		{
 		    if(interrupted())
 		    {
@@ -235,7 +235,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 		    throw ex;
 		}
 		
-		if(ret == 0)
+		if(rs == 0)
 		{
 		    throw TimeoutException(__FILE__, __LINE__);
 		}
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index a63605c7bf4..036ab4d5d32 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -82,11 +82,11 @@ printRequestHeader(ostream& s, BasicStream& stream)
 static void
 printHeader(ostream& s, BasicStream& stream)
 {
-    Byte magic;
-    stream.read(magic);	// Don't bother printing the magic number
-    stream.read(magic);
-    stream.read(magic);
-    stream.read(magic);
+    Byte magicNumber;
+    stream.read(magicNumber);	// Don't bother printing the magic number
+    stream.read(magicNumber);
+    stream.read(magicNumber);
+    stream.read(magicNumber);
 
     Byte pMajor;
     Byte pMinor;
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 514dec0dcb0..d33c96c5473 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -78,9 +78,9 @@ repeat:
 
 	    assert(_fd != INVALID_SOCKET);
 	    FD_SET(_fd, &_wFdSet);
-	    int ret = ::select(_fd + 1, 0, &_wFdSet, 0, 0);
+	    int rs = ::select(_fd + 1, 0, &_wFdSet, 0, 0);
 	    
-	    if(ret == SOCKET_ERROR)
+	    if(rs == SOCKET_ERROR)
 	    {
 		if(interrupted())
 		{
@@ -169,9 +169,9 @@ repeat:
 	    
 	    assert(_fd != INVALID_SOCKET);
 	    FD_SET(_fd, &_rFdSet);
-	    int ret = ::select(_fd + 1, &_rFdSet, 0, 0, 0);
+	    int rs = ::select(_fd + 1, &_rFdSet, 0, 0, 0);
 	    
-	    if(ret == SOCKET_ERROR)
+	    if(rs == SOCKET_ERROR)
 	    {
 		if(interrupted())
 		{
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp
index e6a07121167..2a123f1e7e0 100644
--- a/cpp/src/IcePack/ActivatorI.cpp
+++ b/cpp/src/IcePack/ActivatorI.cpp
@@ -136,14 +136,16 @@ IcePack::ActivatorI::activate(const ServerPtr& server)
     //
     // Normalize the pathname a bit.
     //
-    string::size_type pos;
-    while((pos = path.find("//")) != string::npos)
     {
-	path.erase(pos, 1);
-    }
-    while((pos = path.find("/./")) != string::npos)
-    {
-	path.erase(pos, 2);
+	string::size_type pos;
+	while((pos = path.find("//")) != string::npos)
+	{
+	    path.erase(pos, 1);
+	}
+	while((pos = path.find("/./")) != string::npos)
+	{
+	    path.erase(pos, 2);
+	}
     }
 
     //
@@ -607,18 +609,18 @@ IcePack::ActivatorI::terminationListener()
 		}
 
 		char s[16];
-		int ret;
+		int rs;
 		string message;
 
 		//
 		// Read the message over the pipe.
 		//
-		while((ret = read(fd, &s, 16)) > 0)
+		while((rs = read(fd, &s, 16)) > 0)
 		{
-		    message.append(s, ret);
+		    message.append(s, rs);
 		}
 
-		if(ret == -1)
+		if(rs == -1)
 		{
 		    if(errno != EAGAIN || message.empty())
 		    {
@@ -629,7 +631,7 @@ IcePack::ActivatorI::terminationListener()
 
 		    ++p;
 		}
-		else if(ret == 0)
+		else if(rs == 0)
 		{    
 		    //
 		    // If the pipe was closed, the process has terminated.
diff --git a/cpp/src/IcePack/ApplicationBuilder.cpp b/cpp/src/IcePack/ApplicationBuilder.cpp
index b7a4296a0f8..0c2ed1c036b 100644
--- a/cpp/src/IcePack/ApplicationBuilder.cpp
+++ b/cpp/src/IcePack/ApplicationBuilder.cpp
@@ -170,12 +170,12 @@ IcePack::ApplicationHandler::startElement(const XMLCh* name, ICE_XERCES_NS Attri
 					  _locator);
 	}
 
-	string name = getAttributeValue(attrs, "name");
+	string serverName = getAttributeValue(attrs, "name");
 	string descriptor = _builder.toLocation(getAttributeValue(attrs, "descriptor"));
 	string binpath = _builder.toLocation(getAttributeValueWithDefault(attrs, "binpath", ""));
 	string libpath = getAttributeValueWithDefault(attrs, "libpath", "");
 	string targets = getAttributeValueWithDefault(attrs, "targets", "");
-	_builder.addServer(name, _currentNode, descriptor, binpath, libpath, targets);
+	_builder.addServer(serverName, _currentNode, descriptor, binpath, libpath, targets);
     }
 }
 
diff --git a/cpp/src/IcePack/ApplicationBuilder.h b/cpp/src/IcePack/ApplicationBuilder.h
index 24b10a0896e..05996ba2c9a 100644
--- a/cpp/src/IcePack/ApplicationBuilder.h
+++ b/cpp/src/IcePack/ApplicationBuilder.h
@@ -27,6 +27,7 @@ public:
 
     ApplicationBuilder(const Ice::CommunicatorPtr&, const NodeRegistryPtr&, const std::vector<std::string>&);
 
+    using ComponentBuilder::parse;
     void parse(const std::string&);
 
     void addServer(const std::string&, const std::string&, const std::string&, const std::string&, const std::string&,
diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp
index 42cbc39a8cb..630078f17d1 100644
--- a/cpp/src/IcePack/Client.cpp
+++ b/cpp/src/IcePack/Client.cpp
@@ -166,14 +166,14 @@ Client::run(int argc, char* argv[])
     //
     Ice::UserExceptionFactoryPtr(new ExceptionFactory(communicator()));
 
-    ParserPtr parser = Parser::createParser(communicator(), admin, query);
+    ParserPtr p = Parser::createParser(communicator(), admin, query);
     int status = EXIT_SUCCESS;
 
     if(argc < 2) // No files given
     {
 	if(!commands.empty()) // Commands were given
 	{
-	    int parseStatus = parser->parse(commands, debug);
+	    int parseStatus = p->parse(commands, debug);
 	    if(parseStatus == EXIT_FAILURE)
 	    {
 		status = EXIT_FAILURE;
@@ -181,7 +181,7 @@ Client::run(int argc, char* argv[])
 	}
 	else // No commands, let's use standard input
 	{
-	    int parseStatus = parser->parse(stdin, debug);
+	    int parseStatus = p->parse(stdin, debug);
 	    if(parseStatus == EXIT_FAILURE)
 	    {
 		status = EXIT_FAILURE;
@@ -212,7 +212,7 @@ Client::run(int argc, char* argv[])
 		return EXIT_FAILURE;
 	    }
 	    
-	    int parseStatus = parser->parse(cppHandle, debug);
+	    int parseStatus = p->parse(cppHandle, debug);
 	    
 #ifdef _WIN32
 	    _pclose(cppHandle);
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp
index 33ce7489957..85757014f17 100644
--- a/cpp/src/IcePack/ComponentBuilder.cpp
+++ b/cpp/src/IcePack/ComponentBuilder.cpp
@@ -378,12 +378,12 @@ IcePack::ComponentHandler::startElement(const XMLCh *const name, ICE_XERCES_NS A
 	// If the id is not specified, we ask the builder to generate
 	// an id for us based on the adapter name.
 	//
-	string name = getAttributeValue(attrs, "name");
-	if(name.empty())
+	string adapterName = getAttributeValue(attrs, "name");
+	if(adapterName.empty())
 	{
 	    throw DeploySAXParseException("empty adapter name", _locator);
 	}
-	_currentAdapterId = getAttributeValueWithDefault(attrs, "id", _builder.getDefaultAdapterId(name));
+	_currentAdapterId = getAttributeValueWithDefault(attrs, "id", _builder.getDefaultAdapterId(adapterName));
     }
     else if(str == "object")
     {
@@ -620,9 +620,9 @@ IcePack::ComponentBuilder::setDocumentLocator(const ICE_XERCES_NS Locator* locat
 bool
 IcePack::ComponentBuilder::isTargetDeployable(const string& target) const
 {
-    map<string, string>::const_iterator p = _variables.find("fqn");
-    assert(p != _variables.end());
-    const string fqn = p->second;
+    map<string, string>::const_iterator q = _variables.find("fqn");
+    assert(q != _variables.end());
+    const string fqn = q->second;
 
     for(vector<string>::const_iterator p = _targets.begin(); p != _targets.end(); ++p)
     {
diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp
index ea75fa0adb4..10a0df2bb75 100644
--- a/cpp/src/IcePack/IcePackNode.cpp
+++ b/cpp/src/IcePack/IcePackNode.cpp
@@ -59,6 +59,9 @@ usage(const char* appName)
 	;
 }
 
+extern "C"
+{
+
 static void
 childHandler(int)
 {
@@ -76,6 +79,7 @@ interruptHandler(int)
     assert(activator);
     activator->shutdown();
 }
+}
 
 void
 shutdownActivatorOnInterrupt()
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 41653d40433..297a8e2b029 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -769,7 +769,7 @@ IcePack::Parser::continueLine()
     _continue = true;
 }
 
-char*
+const char*
 IcePack::Parser::getPrompt()
 {
     assert(_commands.empty() && isatty(fileno(yyin)));
diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h
index a16d6f86689..0e78e2cbc34 100644
--- a/cpp/src/IcePack/Parser.h
+++ b/cpp/src/IcePack/Parser.h
@@ -101,7 +101,7 @@ public:
     void getInput(char*, int&, int);
     void nextLine();
     void continueLine();
-    char* getPrompt();
+    const char* getPrompt();
     void scanPosition(const char*);
 
     void error(const char*);
diff --git a/cpp/src/IcePack/ServerBuilder.cpp b/cpp/src/IcePack/ServerBuilder.cpp
index f1715c41c72..fbf7c2ece53 100644
--- a/cpp/src/IcePack/ServerBuilder.cpp
+++ b/cpp/src/IcePack/ServerBuilder.cpp
@@ -284,16 +284,16 @@ IcePack::ServerHandler::startElement(const XMLCh *const name, ICE_XERCES_NS Attr
     }
     else if(str == "service")
     {
-	string name = getAttributeValue(attrs, "name");
+	string serviceName = getAttributeValue(attrs, "name");
 	string descriptor = getAttributeValue(attrs, "descriptor");
 	string targets = getAttributeValueWithDefault(attrs, "targets", "");
-	_builder.addService(name, descriptor, targets);
+	_builder.addService(serviceName, descriptor, targets);
     }
     else if(str == "adapter")
     {
 	assert(!_currentAdapterId.empty());
-	string name = getAttributeValue(attrs, "name");
-	_builder.registerAdapter(name, getAttributeValue(attrs, "endpoints"), _currentAdapterId);
+	string adapterName = getAttributeValue(attrs, "name");
+	_builder.registerAdapter(adapterName, getAttributeValue(attrs, "endpoints"), _currentAdapterId);
     }
 }
 
diff --git a/cpp/src/IcePack/ServerBuilder.h b/cpp/src/IcePack/ServerBuilder.h
index bdac153334b..ba5723c3128 100644
--- a/cpp/src/IcePack/ServerBuilder.h
+++ b/cpp/src/IcePack/ServerBuilder.h
@@ -38,6 +38,8 @@ public:
 		  const std::map<std::string, std::string>&,
 		  const std::vector<std::string>&);
 
+    
+    using ComponentBuilder::parse;
     void parse(const std::string&);
 
     virtual void execute();
diff --git a/cpp/src/IcePack/ServiceBuilder.cpp b/cpp/src/IcePack/ServiceBuilder.cpp
index 99c57e61ab6..4ee7472aa3c 100644
--- a/cpp/src/IcePack/ServiceBuilder.cpp
+++ b/cpp/src/IcePack/ServiceBuilder.cpp
@@ -81,8 +81,8 @@ IcePack::ServiceHandler::startElement(const XMLCh *const name, ICE_XERCES_NS Att
     else if(str == "adapter")
     {
 	assert(!_currentAdapterId.empty());
-	string name = getAttributeValue(attrs, "name");
-	_builder.getServerBuilder().registerAdapter(name, getAttributeValue(attrs, "endpoints"), _currentAdapterId);
+	string adapterName = getAttributeValue(attrs, "name");
+	_builder.getServerBuilder().registerAdapter(adapterName, getAttributeValue(attrs, "endpoints"), _currentAdapterId);
     }
 }
 
diff --git a/cpp/src/IcePack/ServiceBuilder.h b/cpp/src/IcePack/ServiceBuilder.h
index bfc65c11fab..922586adc6b 100644
--- a/cpp/src/IcePack/ServiceBuilder.h
+++ b/cpp/src/IcePack/ServiceBuilder.h
@@ -37,6 +37,8 @@ public:
 		   const std::map<std::string, std::string>&,
 		   const std::vector<std::string>&);
 
+    using ComponentBuilder::parse;
+    
     void parse(const std::string&);
 
     ServerBuilder& getServerBuilder() const;
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp
index 48c036586ed..e7465e1192c 100644
--- a/cpp/src/IcePatch/Util.cpp
+++ b/cpp/src/IcePatch/Util.cpp
@@ -218,7 +218,6 @@ IcePatch::getFileInfo(const string& path, bool exceptionIfNotExist, const Ice::L
 	{
 	    if(!exceptionIfNotExist && errno == ENOENT)
 	    {
-		FileInfo result;
 		result.size = 0;
 		result.time = 0;
 		result.type = FileTypeNotExist;
diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp
index edfe4c1da08..f6315094331 100644
--- a/cpp/src/IceSSL/ConfigParser.cpp
+++ b/cpp/src/IceSSL/ConfigParser.cpp
@@ -403,7 +403,7 @@ IceSSL::ConfigParser::getCertAuth(ICE_XERCES_NS DOMNode* rootNode, CertificateAu
     for(int i = 0; i < attrCount; i++)
     {
         ICE_XERCES_NS DOMNode* attribute = attributes->item(i);
-        string nodeName = toString(attribute->getNodeName());
+        nodeName = toString(attribute->getNodeName());
         string nodeValue = toString(attribute->getNodeValue());
 
         if(nodeName.compare("file") == 0)
diff --git a/cpp/src/IceSSL/Context.cpp b/cpp/src/IceSSL/Context.cpp
index 93df03dc7e0..e6240e10794 100644
--- a/cpp/src/IceSSL/Context.cpp
+++ b/cpp/src/IceSSL/Context.cpp
@@ -304,10 +304,7 @@ IceSSL::Context::setKeyCert(const CertificateDesc& certDesc,
     }
     else if(certDesc.getKeySize() != 0)
     {
-        const CertificateFile& privateKey = certDesc.getPrivate();
-        const CertificateFile& publicKey  = certDesc.getPublic();
-
-        addKeyCert(privateKey, publicKey);
+        addKeyCert(certDesc.getPrivate(), certDesc.getPublic());
     }
 }
 
@@ -439,7 +436,7 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate
 
         if(pkLoadResult <= 0)
         {
-            int errCode = ERR_GET_REASON(ERR_peek_error());
+            errCode = ERR_GET_REASON(ERR_peek_error());
 
             // Note: Because OpenSSL currently (V0.9.6b) performs a check to see if the
             //       key matches the private key when calling SSL_CTX_use_PrivateKey_file().
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 0dec2723057..b6de9514f20 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -105,18 +105,13 @@ create(const CommunicatorPtr& communicator, const string& name, const StringSeq&
 
 }
 
+
 //
 // Thread safety implementation for OpenSSL
 //
 namespace IceSSL
 {
 
-extern "C"
-{
-    void lockingCallback(int, int, const char*, int);
-    unsigned long idFunction();
-}
-
 class SslLockKeeper
 {
 public:
@@ -132,7 +127,10 @@ SslLockKeeper lockKeeper;
 
 }
 
-void IceSSL::lockingCallback(int mode, int type, const char *file, int line)
+extern "C"
+{
+    
+static void lockingCallback(int mode, int type, const char *file, int line)
 {
     if(mode & CRYPTO_LOCK)
     {
@@ -144,8 +142,8 @@ void IceSSL::lockingCallback(int mode, int type, const char *file, int line)
     }
 }
 
-unsigned long
-IceSSL::idFunction()
+static unsigned long
+idFunction()
 {
 #ifdef _WIN32
     return static_cast<unsigned long>(GetCurrentThreadId());
@@ -153,11 +151,12 @@ IceSSL::idFunction()
     return static_cast<unsigned long>(pthread_self());
 #endif
 }
+}
 
 IceSSL::SslLockKeeper::SslLockKeeper()
 {
-    CRYPTO_set_id_callback(IceSSL::idFunction);
-    CRYPTO_set_locking_callback(IceSSL::lockingCallback);
+    CRYPTO_set_id_callback(idFunction);
+    CRYPTO_set_locking_callback(lockingCallback);
 }
 
 IceSSL::SslLockKeeper::~SslLockKeeper()
diff --git a/cpp/src/IceSSL/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp
index fcff84855e2..c8eee143f12 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtils.cpp
@@ -414,7 +414,7 @@ IceSSL::sslGetErrors()
     return errorMessage;
 }
 
-static char* errorStrings[] =
+static const char* errorStrings[] =
 {
     "Unable to get issuer's certificate.",
     "Unable to get certificate revocation list.",
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp
index 63096767a0f..d55a09631f9 100644
--- a/cpp/src/IceSSL/RSACertificateGen.cpp
+++ b/cpp/src/IceSSL/RSACertificateGen.cpp
@@ -252,12 +252,12 @@ IceSSL::RSACertificateGen::generate(const RSACertificateGenContext& context)
     X509_gmtime_adj(X509_get_notAfter(x509SelfSigned), context.getSecondsValid());
 
     // Set up subject/issuer Distinguished Name (DN).
-    X509_NAME_add_entry_by_txt(subjectName, "C",  MBSTRING_ASC, context.getCountry(),            -1, -1, 0);
-    X509_NAME_add_entry_by_txt(subjectName, "ST", MBSTRING_ASC, context.getStateProvince(),      -1, -1, 0);
-    X509_NAME_add_entry_by_txt(subjectName, "L",  MBSTRING_ASC, context.getLocality(),           -1, -1, 0);
-    X509_NAME_add_entry_by_txt(subjectName, "O",  MBSTRING_ASC, context.getOrganization(),       -1, -1, 0);
-    X509_NAME_add_entry_by_txt(subjectName, "OU", MBSTRING_ASC, context.getOrganizationalUnit(), -1, -1, 0);
-    X509_NAME_add_entry_by_txt(subjectName, "CN", MBSTRING_ASC, context.getCommonName(),         -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("C"),  MBSTRING_ASC, context.getCountry(),            -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("ST"), MBSTRING_ASC, context.getStateProvince(),      -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("L"),  MBSTRING_ASC, context.getLocality(),           -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("O"),  MBSTRING_ASC, context.getOrganization(),       -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("OU"), MBSTRING_ASC, context.getOrganizationalUnit(), -1, -1, 0);
+    X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("CN"), MBSTRING_ASC, context.getCommonName(),         -1, -1, 0);
 
     // Self signed - set issuer and subject names identical
     X509_set_issuer_name(x509SelfSigned, subjectName);
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 57942253c68..c1c46fca574 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -180,14 +180,14 @@ Client::run(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
 
-    ParserPtr parser = Parser::createParser(communicator(), manager);
+    ParserPtr p = Parser::createParser(communicator(), manager);
     int status = EXIT_SUCCESS;
 
     if(argc < 2) // No files given
     {
 	if(!commands.empty()) // Commands were given
 	{
-	    int parseStatus = parser->parse(commands, debug);
+	    int parseStatus = p->parse(commands, debug);
 	    if(parseStatus == EXIT_FAILURE)
 	    {
 		status = EXIT_FAILURE;
@@ -195,7 +195,7 @@ Client::run(int argc, char* argv[])
 	}
 	else // No commands, let's use standard input
 	{
-	    int parseStatus = parser->parse(stdin, debug);
+	    int parseStatus = p->parse(stdin, debug);
 	    if(parseStatus == EXIT_FAILURE)
 	    {
 		status = EXIT_FAILURE;
@@ -226,7 +226,7 @@ Client::run(int argc, char* argv[])
 		return EXIT_FAILURE;
 	    }
 	    
-	    int parseStatus = parser->parse(cppHandle, debug);
+	    int parseStatus = p->parse(cppHandle, debug);
 	    
 #ifdef _WIN32
 	    _pclose(cppHandle);
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 86d5a2e12fa..33640ec96d4 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -291,9 +291,11 @@ Parser::graph(const list<string>& _args)
 	//
 	// Compute the new edge set.
 	//
-	vector<int> edges;
-	graph.compute(edges, maxCost);
-	graph.swap(edges);
+	{
+	    vector<int> edges;
+	    graph.compute(edges, maxCost);
+	    graph.swap(edges);
+	}
 
 	//
 	// Ensure each vertex is present.
@@ -495,7 +497,7 @@ Parser::continueLine()
     _continue = true;
 }
 
-char*
+const char*
 Parser::getPrompt()
 {
     assert(_commands.empty() && isatty(fileno(yyin)));
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index 7cb4284491c..f7bc1f156ee 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -79,7 +79,7 @@ public:
     void getInput(char*, int&, int);
     void nextLine();
     void continueLine();
-    char* getPrompt();
+    const char* getPrompt();
     void scanPosition(const char*);
 
     void error(const char*);
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 2b3834ac072..bb11b277803 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -426,7 +426,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string&
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-	BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
+	builtin = BuiltinPtr::dynamicCast(seq->type());
 	if(builtin && builtin->kind() != Builtin::KindObject && builtin->kind() != Builtin::KindObjectProxy)
 	{
 	    out << nl << stream << deref << func << fixedParam << ");";
@@ -610,7 +610,7 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const
     SequencePtr seq = SequencePtr::dynamicCast(type);
     if(seq)
     {
-	BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
+	builtin = BuiltinPtr::dynamicCast(seq->type());
 	if(builtin && builtin->kind() != Builtin::KindObject && builtin->kind() != Builtin::KindObjectProxy)
 	{
             if(marshal)
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 023ae1ead0d..8263d3b959f 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -161,7 +161,7 @@ Slice::Gen::operator!() const
 }
 
 void
-Slice::Gen::generate(const UnitPtr& unit)
+Slice::Gen::generate(const UnitPtr& p)
 {
     C << "\n#include <";
     if(_include.size())
@@ -174,19 +174,19 @@ Slice::Gen::generate(const UnitPtr& unit)
     H << "\n#include <Ice/ProxyF.h>";
     H << "\n#include <Ice/ObjectF.h>";
 
-    if(unit->usesProxies())
+    if(p->usesProxies())
     {
 	H << "\n#include <Ice/Exception.h>";
 	H << "\n#include <Ice/LocalObject.h>";
 	H << "\n#include <Ice/Proxy.h>";
 	H << "\n#include <Ice/Object.h>";
 	H << "\n#include <Ice/Outgoing.h>";
-	if(unit->hasContentsWithMetaData("ami"))
+	if(p->hasContentsWithMetaData("ami"))
 	{
 	    H << "\n#include <Ice/OutgoingAsync.h>";
 	}
 	H << "\n#include <Ice/Incoming.h>";
-	if(unit->hasContentsWithMetaData("amd"))
+	if(p->hasContentsWithMetaData("amd"))
 	{
 	    H << "\n#include <Ice/IncomingAsync.h>";
 	}
@@ -197,7 +197,7 @@ Slice::Gen::generate(const UnitPtr& unit)
 	C << "\n#include <Ice/BasicStream.h>";
 	C << "\n#include <Ice/Stream.h>";
     }
-    else if(unit->usesNonLocals())
+    else if(p->usesNonLocals())
     {
 	H << "\n#include <Ice/Exception.h>";
 	H << "\n#include <Ice/LocalObject.h>";
@@ -211,7 +211,7 @@ Slice::Gen::generate(const UnitPtr& unit)
 	H << "\n#include <Ice/LocalObject.h>";
     }
 
-    StringList includes = unit->includeFiles();
+    StringList includes = p->includeFiles();
     for(StringList::const_iterator q = includes.begin(); q != includes.end(); ++q)
     {
 	H << "\n#include <" << changeInclude(*q, _includePaths) << ".h>";
@@ -227,40 +227,40 @@ Slice::Gen::generate(const UnitPtr& unit)
     }
 
     ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
-    unit->visit(&proxyDeclVisitor);
+    p->visit(&proxyDeclVisitor);
 
     ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
-    unit->visit(&objectDeclVisitor);
+    p->visit(&objectDeclVisitor);
 
     IceInternalVisitor iceInternalVisitor(H, C, _dllExport);
-    unit->visit(&iceInternalVisitor);
+    p->visit(&iceInternalVisitor);
 
     HandleVisitor handleVisitor(H, C, _dllExport);
-    unit->visit(&handleVisitor);
+    p->visit(&handleVisitor);
 
     TypesVisitor typesVisitor(H, C, _dllExport);
-    unit->visit(&typesVisitor);
+    p->visit(&typesVisitor);
 
     AsyncVisitor asyncVisitor(H, C, _dllExport);
-    unit->visit(&asyncVisitor);
+    p->visit(&asyncVisitor);
 
     AsyncImplVisitor asyncImplVisitor(H, C, _dllExport);
-    unit->visit(&asyncImplVisitor);
+    p->visit(&asyncImplVisitor);
 
     ProxyVisitor proxyVisitor(H, C, _dllExport);
-    unit->visit(&proxyVisitor);
+    p->visit(&proxyVisitor);
 
     DelegateVisitor delegateVisitor(H, C, _dllExport);
-    unit->visit(&delegateVisitor);
+    p->visit(&delegateVisitor);
 
     DelegateMVisitor delegateMVisitor(H, C, _dllExport);
-    unit->visit(&delegateMVisitor);
+    p->visit(&delegateMVisitor);
 
     DelegateDVisitor delegateDVisitor(H, C, _dllExport);
-    unit->visit(&delegateDVisitor);
+    p->visit(&delegateDVisitor);
 
     ObjectVisitor objectVisitor(H, C, _dllExport);
-    unit->visit(&objectVisitor);
+    p->visit(&objectVisitor);
 
     if(_impl)
     {
@@ -279,7 +279,7 @@ Slice::Gen::generate(const UnitPtr& unit)
         implC << _base << "I.h>";
 
         ImplVisitor implVisitor(implH, implC, _dllExport);
-        unit->visit(&implVisitor);
+        p->visit(&implVisitor);
     }
 }
 
@@ -1254,15 +1254,15 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
     {
 	string typeString = (*q)->isOutParam() ? outputTypeToString((*q)->type()) : inputTypeToString((*q)->type());
-	string name = fixKwd((*q)->name());
+	string paramName = fixKwd((*q)->name());
 
 	params += typeString;
 	params += ", ";
 	paramsDecl += typeString;
 	paramsDecl += ' ';
-	paramsDecl += name;
+	paramsDecl += paramName;
 	paramsDecl += ", ";
-	args += name;
+	args += paramName;
 	args += ", ";
 
 	if(!(*q)->isOutParam())
@@ -1271,9 +1271,9 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 	    paramsAMI += ", ";
 	    paramsDeclAMI += typeString;
 	    paramsDeclAMI += ' ';
-	    paramsDeclAMI += name;
+	    paramsDeclAMI += paramName;
 	    paramsDeclAMI += ", ";
-	    argsAMI += name;
+	    argsAMI += paramName;
 	    argsAMI += ", ";
 	}
     }
@@ -1608,18 +1608,18 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     ParamDeclList paramList = p->parameters();
     for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
     {
-	string name = fixKwd((*q)->name());
+	string paramName = fixKwd((*q)->name());
 	TypePtr type = (*q)->type();
 	bool isOutParam = (*q)->isOutParam();
 	string typeString;
 	if(isOutParam)
 	{
-	    outParams.push_back(make_pair(type, name));
+	    outParams.push_back(make_pair(type, paramName));
 	    typeString = outputTypeToString(type);
 	}
 	else
 	{
-	    inParams.push_back(make_pair(type, name));
+	    inParams.push_back(make_pair(type, paramName));
 	    typeString = inputTypeToString(type);
 	}
 
@@ -1627,7 +1627,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
 	params += ", ";
 	paramsDecl += typeString;
 	paramsDecl += ' ';
-	paramsDecl += name;
+	paramsDecl += paramName;
 	paramsDecl += ", ";
 	
 	if(!isOutParam)
@@ -1636,7 +1636,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
 	    paramsAMI += ", ";
 	    paramsDeclAMI += typeString;
 	    paramsDeclAMI += ' ';
-	    paramsDeclAMI += name;
+	    paramsDeclAMI += paramName;
 	    paramsDeclAMI += ", ";
 	}
     }
@@ -1856,15 +1856,15 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
     for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
     {
 	string typeString = (*q)->isOutParam() ? outputTypeToString((*q)->type()) : inputTypeToString((*q)->type());
-	string name = fixKwd((*q)->name());
+	string paramName = fixKwd((*q)->name());
 
 	params += typeString;
 	params += ", ";
 	paramsDecl += typeString;
 	paramsDecl += ' ';
-	paramsDecl += name;
+	paramsDecl += paramName;
 	paramsDecl += ", ";
-	args += name;
+	args += paramName;
 	args += ", ";
 
 	if(!(*q)->isOutParam())
@@ -2389,18 +2389,18 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
     ParamDeclList paramList = p->parameters();
     for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
     {
-	string name = fixKwd((*q)->name());
+	string paramName = fixKwd((*q)->name());
 	TypePtr type = (*q)->type();
 	bool isOutParam = (*q)->isOutParam();
 	string typeString;
 	if(isOutParam)
 	{
-	    outParams.push_back(make_pair(type, name));
+	    outParams.push_back(make_pair(type, paramName));
 	    typeString = outputTypeToString(type);
 	}
 	else
 	{
-	    inParams.push_back(make_pair(type, name));
+	    inParams.push_back(make_pair(type, paramName));
 	    typeString = inputTypeToString((*q)->type());
 	}
 
@@ -2414,8 +2414,8 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 	params += typeString;
 	paramsDecl += typeString;
 	paramsDecl += ' ';
-	paramsDecl += name;
-	args += name;
+	paramsDecl += paramName;
+	args += paramName;
 
 	if(!isOutParam)
 	{
@@ -2423,9 +2423,9 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 	    paramsAMD += ", ";
 	    paramsDeclAMD += typeString;
 	    paramsDeclAMD += ' ';
-	    paramsDeclAMD += name;
+	    paramsDeclAMD += paramName;
 	    paramsDeclAMD += ", ";
-	    argsAMD += name;
+	    argsAMD += paramName;
 	    argsAMD += ", ";
 	}
     }
@@ -3111,8 +3111,7 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     H << nl << "class " << name << "I : ";
     H.useCurrentPosAsIndent();
     H << "virtual public " << name;
-    ClassList::const_iterator q;
-    for(q = bases.begin(); q != bases.end(); ++q)
+    for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
     {
         H << ',' << nl << "virtual public " << fixKwd((*q)->scoped()) << "I";
     }
@@ -3357,7 +3356,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
     {
 	if((*q)->isOutParam())
 	{
-	    string name = fixKwd((*q)->name());
+	    string paramName = fixKwd((*q)->name());
 	    TypePtr type = (*q)->type();
 	    string typeString = inputTypeToString(type);
 	    
@@ -3371,10 +3370,10 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
 	    params += typeString;
 	    paramsDecl += typeString;
 	    paramsDecl += ' ';
-	    paramsDecl += name;
-	    args += name;
+	    paramsDecl += paramName;
+	    args += paramName;
 	    
-	    outParams.push_back(make_pair(type, name));
+	    outParams.push_back(make_pair(type, paramName));
 	}
     }
 
@@ -3565,7 +3564,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
     {
 	if((*q)->isOutParam())
 	{
-	    string name = fixKwd((*q)->name());
+	    string paramName = fixKwd((*q)->name());
 	    TypePtr type = (*q)->type();
 	    string typeString = inputTypeToString(type);
 	    
@@ -3579,10 +3578,10 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p)
 	    params += typeString;
 	    paramsDecl += typeString;
 	    paramsDecl += ' ';
-	    paramsDecl += name;
-	    args += name;
+	    paramsDecl += paramName;
+	    args += paramName;
 	    
-	    outParams.push_back(make_pair(type, name));
+	    outParams.push_back(make_pair(type, paramName));
 	}
     }
 
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 528dfff3c9e..b2f0357164f 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -263,12 +263,12 @@ main(int argc, char* argv[])
 		return EXIT_FAILURE;
 	    }
 	
-	    UnitPtr unit = Unit::createUnit(false, false, ice, caseSensitive);
-	    int parseStatus = unit->parse(cppHandle, debug);
+	    UnitPtr u = Unit::createUnit(false, false, ice, caseSensitive);
+	    int parseStatus = u->parse(cppHandle, debug);
 	
 	    if(!icecpp.close())
 	    {
-		unit->destroy();
+		u->destroy();
 		return EXIT_FAILURE;
 	    }
 
@@ -282,13 +282,13 @@ main(int argc, char* argv[])
 			includePaths, dllExport, output, impl);
 		if(!gen)
 		{
-		    unit->destroy();
+		    u->destroy();
 		    return EXIT_FAILURE;
 		}
-		gen.generate(unit);
+		gen.generate(u);
 	    }
 
-	    unit->destroy();
+	    u->destroy();
 	}
     }
 
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 9e9d0b86f56..6e3b6a45f16 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -52,17 +52,17 @@ Slice::Gen::operator!() const
 }
 
 void
-Slice::Gen::generate(const UnitPtr& unit)
+Slice::Gen::generate(const UnitPtr& p)
 {
-    unit->mergeModules();
+    p->mergeModules();
 
     //
     // I don't want the top-level module to be sorted, therefore no
-    // unit->sort() before or after the unit->sortContents().
+    // p->sort() before or after the p->sortContents().
     //
-    unit->sortContents();
+    p->sortContents();
 
-    unit->visit(this);
+    p->visit(this);
 }
 
 bool
@@ -490,11 +490,11 @@ Slice::Gen::visitClassDefStart(const ClassDefPtr& p)
 		O.inc();
 		O << nl << "throws";
 		O.inc();
-		ExceptionList::const_iterator r = throws.begin();
-		while(r != throws.end())
+		ExceptionList::const_iterator t = throws.begin();
+		while(t != throws.end())
 		{
-		    O << nl << toString(*r, p);
-		    if(++r != throws.end())
+		    O << nl << toString(*t, p);
+		    if(++t != throws.end())
 		    {
 			O << ',';
 		    }
@@ -876,7 +876,6 @@ Slice::Gen::printComment(const ContainedPtr& p)
 	start("variablelist");
 	for(StringList::const_iterator q = par.begin(); q != par.end(); ++q)
 	{
-	    string::size_type pos;
 	    string term;
 	    pos = q->find_first_of(" \t\r\n");
 	    if(pos != string::npos)
@@ -920,7 +919,6 @@ Slice::Gen::printComment(const ContainedPtr& p)
 	start("variablelist");
 	for(StringList::const_iterator q = throws.begin(); q != throws.end(); ++q)
 	{
-	    string::size_type pos;
 	    string term;
 	    pos = q->find_first_of(" \t\r\n");
 	    if(pos != string::npos)
@@ -1261,7 +1259,7 @@ Slice::Gen::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container,
     ParamDeclPtr pd = ParamDeclPtr::dynamicCast(p);
     if(pd)
     {
-	OperationPtr op = OperationPtr::dynamicCast(pd->container());
+	op = OperationPtr::dynamicCast(pd->container());
 	assert(op);
 	if(withLink && pd->includeLevel() == 0)
 	{
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index 96f186f0e53..d94c31b40a0 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -181,7 +181,7 @@ main(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
 
-    UnitPtr unit = Unit::createUnit(true, false, ice, caseSensitive);
+    UnitPtr p = Unit::createUnit(true, false, ice, caseSensitive);
 
     int status = EXIT_SUCCESS;
 
@@ -192,15 +192,15 @@ main(int argc, char* argv[])
 
 	if(cppHandle == 0)
 	{
-	    unit->destroy();
+	    p->destroy();
 	    return EXIT_FAILURE;
 	}
 	
-	status = unit->parse(cppHandle, debug);
+	status = p->parse(cppHandle, debug);
 
 	if(!icecpp.close())
 	{
-	    unit->destroy();
+	    p->destroy();
 	    return EXIT_FAILURE;
 	}
     }
@@ -210,13 +210,13 @@ main(int argc, char* argv[])
 	Gen gen(argv[0], docbook, standAlone, noGlobals, chapter);
 	if(!gen)
 	{
-	    unit->destroy();
+	    p->destroy();
 	    return EXIT_FAILURE;
 	}
-	gen.generate(unit);
+	gen.generate(p);
     }
     
-    unit->destroy();
+    p->destroy();
 
     return status;
 }
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index b9ebc638a2d..c63deb92dae 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -161,7 +161,7 @@ writeCodecC(const TypePtr& type, const string& name, const string& freezeType, O
 }
 
 bool
-writeCodecs(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output& C, const string& dllExport,
+writeCodecs(const string& n, UnitPtr& u, const Dict& dict, Output& H, Output& C, const string& dllExport,
             bool binary)
 {
     string absolute = dict.name;
@@ -190,7 +190,7 @@ writeCodecs(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output&
 	return false;
     }
 
-    TypeList keyTypes = unit->lookupType(dict.key, false);
+    TypeList keyTypes = u->lookupType(dict.key, false);
     if(keyTypes.empty())
     {
 	cerr << n << ": `" << dict.key << "' is not a valid type" << endl;
@@ -198,7 +198,7 @@ writeCodecs(const string& n, UnitPtr& unit, const Dict& dict, Output& H, Output&
     }
     TypePtr keyType = keyTypes.front();
     
-    TypeList valueTypes = unit->lookupType(dict.value, false);
+    TypeList valueTypes = u->lookupType(dict.value, false);
     if(valueTypes.empty())
     {
 	cerr << n << ": `" << dict.value << "' is not a valid type" << endl;
@@ -499,7 +499,7 @@ main(int argc, char* argv[])
 	fileC = output + '/' + fileC;
     }
 
-    UnitPtr unit = Unit::createUnit(true, false, ice, caseSensitive);
+    UnitPtr u = Unit::createUnit(true, false, ice, caseSensitive);
 
     StringList includes;
 
@@ -515,23 +515,23 @@ main(int argc, char* argv[])
 
 	if(cppHandle == 0)
 	{
-	    unit->destroy();
+	    u->destroy();
 	    return EXIT_FAILURE;
 	}
 	
-	status = unit->parse(cppHandle, debug);
+	status = u->parse(cppHandle, debug);
 
 	if(!icecpp.close())
 	{
-	    unit->destroy();
+	    u->destroy();
 	    return EXIT_FAILURE;	    
 	}
     }
 
     if(status == EXIT_SUCCESS)
     {
-	unit->mergeModules();
-	unit->sort();
+	u->mergeModules();
+	u->sort();
 
 	{
 	    for(vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
@@ -548,7 +548,7 @@ main(int argc, char* argv[])
 	if(!H)
 	{
 	    cerr << argv[0] << ": can't open `" << fileH << "' for writing: " << strerror(errno) << endl;
-	    unit->destroy();
+	    u->destroy();
 	    return EXIT_FAILURE;
 	}
 	printHeader(H);
@@ -559,7 +559,7 @@ main(int argc, char* argv[])
 	if(!C)
 	{
 	    cerr << argv[0] << ": can't open `" << fileC << "' for writing: " << strerror(errno) << endl;
-	    unit->destroy();
+	    u->destroy();
 	    return EXIT_FAILURE;
 	}
 	printHeader(C);
@@ -609,16 +609,16 @@ main(int argc, char* argv[])
 	    {
 		try
 		{
-		    if(!writeCodecs(argv[0], unit, *p, H, C, dllExport, binary))
+		    if(!writeCodecs(argv[0], u, *p, H, C, dllExport, binary))
 		    {
-			unit->destroy();
+			u->destroy();
 			return EXIT_FAILURE;
 		    }
 		}
 		catch(...)
 		{
 		    cerr << argv[0] << ": unknown exception" << endl;
-		    unit->destroy();
+		    u->destroy();
 		    return EXIT_FAILURE;
 		}
 	    }
@@ -628,7 +628,7 @@ main(int argc, char* argv[])
 	C << '\n';
     }
     
-    unit->destroy();
+    u->destroy();
 
     return status;
 }
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index b31bbe5979a..c4f9398c8a5 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -46,7 +46,7 @@ FreezeGenerator::FreezeGenerator(const string& prog, bool binary, const string&
 }
 
 bool
-FreezeGenerator::generate(UnitPtr& unit, const Dict& dict)
+FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
 {
     static const char* builtinTable[] =
     {
@@ -74,7 +74,7 @@ FreezeGenerator::generate(UnitPtr& unit, const Dict& dict)
         name = dict.name.substr(pos + 1);
     }
 
-    TypeList keyTypes = unit->lookupType(dict.key, false);
+    TypeList keyTypes = u->lookupType(dict.key, false);
     if(keyTypes.empty())
     {
         cerr << _prog << ": `" << dict.key << "' is not a valid type" << endl;
@@ -82,7 +82,7 @@ FreezeGenerator::generate(UnitPtr& unit, const Dict& dict)
     }
     TypePtr keyType = keyTypes.front();
     
-    TypeList valueTypes = unit->lookupType(dict.value, false);
+    TypeList valueTypes = u->lookupType(dict.value, false);
     if(valueTypes.empty())
     {
         cerr << _prog << ": `" << dict.value << "' is not a valid type" << endl;
@@ -641,7 +641,7 @@ main(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    UnitPtr unit = Unit::createUnit(true, false, ice, caseSensitive);
+    UnitPtr u = Unit::createUnit(true, false, ice, caseSensitive);
 
     int status = EXIT_SUCCESS;
 
@@ -659,15 +659,15 @@ main(int argc, char* argv[])
 
 	    if(cppHandle == 0)
 	    {
-		unit->destroy();
+		u->destroy();
 		return EXIT_FAILURE;
 	    }
 	    
-	    status = unit->parse(cppHandle, debug);
+	    status = u->parse(cppHandle, debug);
 
 	    if(!icecpp.close())
 	    {
-		unit->destroy();
+		u->destroy();
 		return EXIT_FAILURE;
 	    }	    
 	}
@@ -680,8 +680,8 @@ main(int argc, char* argv[])
 
     if(status == EXIT_SUCCESS)
     {
-        unit->mergeModules();
-        unit->sort();
+        u->mergeModules();
+        u->sort();
 
         FreezeGenerator gen(argv[0], binary, output);
 
@@ -689,22 +689,22 @@ main(int argc, char* argv[])
         {
             try
             {
-                if(!gen.generate(unit, *p))
+                if(!gen.generate(u, *p))
                 {
-                    unit->destroy();
+                    u->destroy();
                     return EXIT_FAILURE;
                 }
             }
             catch(...)
             {
                 cerr << argv[0] << ": unknown exception" << endl;
-                unit->destroy();
+                u->destroy();
                 return EXIT_FAILURE;
             }
         }
     }
     
-    unit->destroy();
+    u->destroy();
 
     return status;
 }
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 79294d858e9..2cc87fef63e 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -389,18 +389,19 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p)
     assert(scopedIter != ids.end());
     int scopedPos = ice_distance(firstIter, scopedIter);
 
-    StringList::const_iterator q;
-
     out << sp << nl << "public static final String[] __ids =";
     out << sb;
-    q = ids.begin();
-    while(q != ids.end())
+
     {
-        out << nl << '"' << *q << '"';
-        if(++q != ids.end())
-        {
-            out << ',';
-        }
+	StringList::const_iterator q = ids.begin();
+	while(q != ids.end())
+	{
+	    out << nl << '"' << *q << '"';
+	    if(++q != ids.end())
+	    {
+		out << ',';
+	    }
+	}
     }
     out << eb << ';';
 
@@ -544,10 +545,10 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p)
 	    if(!throws.empty())
 	    {
 		out << eb;
-		ExceptionList::const_iterator r;
-		for(r = throws.begin(); r != throws.end(); ++r)
+		ExceptionList::const_iterator t;
+		for(t = throws.begin(); t != throws.end(); ++t)
 		{
-		    string exS = getAbsolute((*r)->scoped(), scope);
+		    string exS = getAbsolute((*t)->scoped(), scope);
 		    out << nl << "catch(" << exS << " ex)";
 		    out << sb;
 		    out << nl << "__os.writeUserException(ex);";
@@ -684,11 +685,11 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p)
                 //
                 // There's probably a better way to do this
                 //
-                for(OperationList::const_iterator r = allOps.begin(); r != allOps.end(); ++r)
+                for(OperationList::const_iterator t = allOps.begin(); t != allOps.end(); ++t)
                 {
-                    if((*r)->name() == (*q))
+                    if((*t)->name() == (*q))
                     {
-                        ContainerPtr container = (*r)->container();
+                        ContainerPtr container = (*t)->container();
                         ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
                         assert(cl);
                         if(cl->scoped() == p->scoped())
@@ -741,58 +742,58 @@ Slice::Gen::operator!() const
 }
 
 void
-Slice::Gen::generate(const UnitPtr& unit)
+Slice::Gen::generate(const UnitPtr& p)
 {
     OpsVisitor opsVisitor(_dir, _package);
-    unit->visit(&opsVisitor);
+    p->visit(&opsVisitor);
 
     TypesVisitor typesVisitor(_dir, _package);
-    unit->visit(&typesVisitor);
+    p->visit(&typesVisitor);
 
     HolderVisitor holderVisitor(_dir, _package);
-    unit->visit(&holderVisitor);
+    p->visit(&holderVisitor);
 
     HelperVisitor helperVisitor(_dir, _package);
-    unit->visit(&helperVisitor);
+    p->visit(&helperVisitor);
 
     ProxyVisitor proxyVisitor(_dir, _package);
-    unit->visit(&proxyVisitor);
+    p->visit(&proxyVisitor);
 
     DelegateVisitor delegateVisitor(_dir, _package);
-    unit->visit(&delegateVisitor);
+    p->visit(&delegateVisitor);
 
     DelegateMVisitor delegateMVisitor(_dir, _package);
-    unit->visit(&delegateMVisitor);
+    p->visit(&delegateMVisitor);
 
     DelegateDVisitor delegateDVisitor(_dir, _package);
-    unit->visit(&delegateDVisitor);
+    p->visit(&delegateDVisitor);
 
     DispatcherVisitor dispatcherVisitor(_dir, _package);
-    unit->visit(&dispatcherVisitor);
+    p->visit(&dispatcherVisitor);
 
     AsyncVisitor asyncVisitor(_dir, _package);
-    unit->visit(&asyncVisitor);
+    p->visit(&asyncVisitor);
 }
 
 void
-Slice::Gen::generateTie(const UnitPtr& unit)
+Slice::Gen::generateTie(const UnitPtr& p)
 {
     TieVisitor tieVisitor(_dir, _package);
-    unit->visit(&tieVisitor);
+    p->visit(&tieVisitor);
 }
 
 void
-Slice::Gen::generateImpl(const UnitPtr& unit)
+Slice::Gen::generateImpl(const UnitPtr& p)
 {
     ImplVisitor implVisitor(_dir, _package);
-    unit->visit(&implVisitor);
+    p->visit(&implVisitor);
 }
 
 void
-Slice::Gen::generateImplTie(const UnitPtr& unit)
+Slice::Gen::generateImplTie(const UnitPtr& p)
 {
     ImplTieVisitor implTieVisitor(_dir, _package);
-    unit->visit(&implTieVisitor);
+    p->visit(&implTieVisitor);
 }
 
 Slice::Gen::OpsVisitor::OpsVisitor(const string& dir, const string& package) :
@@ -3077,7 +3078,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
         out << "java.util.Map __context)";
         writeDelegateThrowsClause(scope, throws);
         out << sb;
-	list<string> metaData = op->getMetaData();
+
         out << nl << "IceInternal.Outgoing __out = getOutgoing(\"" << op->name() << "\", " << sliceModeToIceMode(op)
 	    << ", __context);";
         out << nl << "try";
@@ -3107,25 +3108,25 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
             out << sb;
             out << nl << "final String[] __throws =";
             out << sb;
-            ExceptionList::const_iterator r;
-            for(r = throws.begin(); r != throws.end(); ++r)
+            ExceptionList::const_iterator t;
+            for(t = throws.begin(); t != throws.end(); ++t)
             {
-                if(r != throws.begin())
+                if(t != throws.begin())
                 {
                     out << ",";
                 }
-                out << nl << "\"" << (*r)->scoped() << "\"";
+                out << nl << "\"" << (*t)->scoped() << "\"";
             }
             out << eb;
             out << ';';
             out << nl << "switch(__is.throwException(__throws))";
             out << sb;
             int count = 0;
-            for(r = throws.begin(); r != throws.end(); ++r)
+            for(t = throws.begin(); t != throws.end(); ++t)
             {
                 out << nl << "case " << count << ':';
                 out << sb;
-                string abs = getAbsolute((*r)->scoped(), scope);
+                string abs = getAbsolute((*t)->scoped(), scope);
                 out << nl << abs << " __ex = new " << abs << "();";
                 out << nl << "__ex.__read(__is);";
                 out << nl << "throw __ex;";
@@ -3134,9 +3135,9 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
             }
             out << eb;
             out << eb;
-            for(r = throws.begin(); r != throws.end(); ++r)
+            for(t = throws.begin(); t != throws.end(); ++t)
             {
-                out << nl << "catch(" << getAbsolute((*r)->scoped(), scope) << " __ex)";
+                out << nl << "catch(" << getAbsolute((*t)->scoped(), scope) << " __ex)";
                 out << sb;
                 out << nl << "throw __ex;";
                 out << eb;
@@ -3184,7 +3185,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    out << sp;
 	    out << nl << "public void" << nl << opName << "_async(" << paramsAMI << ", java.util.Map __context)";
 	    out << sb;
-	    list<string> metaData = op->getMetaData();
+	    
 	    out << nl << "__cb.__setup(__connection, __reference, \"" << op->name() << "\", " << sliceModeToIceMode(op)
 		<< ", __context);";
 	    if(!inParams.empty())
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index e5263bd05cb..4dc5f78fd0c 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -245,8 +245,8 @@ main(int argc, char* argv[])
 		return EXIT_FAILURE;
 	    }
 
-	    UnitPtr unit = Unit::createUnit(false, false, ice, caseSensitive);
-	    int parseStatus = unit->parse(cppHandle, debug);
+	    UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
+	    int parseStatus = p->parse(cppHandle, debug);
 
 	    if(!icecpp.close())
 	    {
@@ -262,25 +262,25 @@ main(int argc, char* argv[])
 		Gen gen(argv[0], icecpp.getBaseName(), includePaths, package, output);
 		if(!gen)
 		{
-		    unit->destroy();
+		    p->destroy();
 		    return EXIT_FAILURE;
 		}
-		gen.generate(unit);
+		gen.generate(p);
 		if(tie)
 		{
-		    gen.generateTie(unit);
+		    gen.generateTie(p);
 		}
 		if(impl)
 		{
-		    gen.generateImpl(unit);
+		    gen.generateImpl(p);
 		}
 		if(implTie)
 		{
-		    gen.generateImplTie(unit);
+		    gen.generateImplTie(p);
 		}
 	    }
 
-	    unit->destroy();
+	    p->destroy();
 	}
     }
 
diff --git a/cpp/src/slice2wsdl/Main.cpp b/cpp/src/slice2wsdl/Main.cpp
index 98cb57d99d6..969ae986e4e 100644
--- a/cpp/src/slice2wsdl/Main.cpp
+++ b/cpp/src/slice2wsdl/Main.cpp
@@ -177,12 +177,12 @@ main(int argc, char* argv[])
 	return EXIT_FAILURE;
     }
     
-    UnitPtr unit = Unit::createUnit(false, false, ice, caseSensitive);
-    int parseStatus = unit->parse(cppHandle, debug);
+    UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
+    int parseStatus = p->parse(cppHandle, debug);
     
     if(!icecpp.close())
     {
-	unit->destroy();
+	p->destroy();
 	return EXIT_FAILURE;
     }	    
     
@@ -199,7 +199,7 @@ main(int argc, char* argv[])
 	    for(idx = 2 ; idx < argc; ++idx)
 	    {
 		ClassDeclPtr classDecl;
-		TypeList classTypes = unit->lookupType(argv[idx], false);
+		TypeList classTypes = p->lookupType(argv[idx], false);
 		if(!classTypes.empty())
 		{
 		    classDecl = ClassDeclPtr::dynamicCast(classTypes.front());
@@ -215,11 +215,11 @@ main(int argc, char* argv[])
 	}
 	else
 	{
-	    unit->visit(&gen);
+	    p->visit(&gen);
 	}
     }
     
-    unit->destroy();
+    p->destroy();
 
     return status;
 }
diff --git a/cpp/src/slice2xsd/Gen.cpp b/cpp/src/slice2xsd/Gen.cpp
index d7eb24a8938..800c599690c 100644
--- a/cpp/src/slice2xsd/Gen.cpp
+++ b/cpp/src/slice2xsd/Gen.cpp
@@ -71,9 +71,9 @@ Slice::Gen::operator!() const
 }
 
 void
-Slice::Gen::generate(const UnitPtr& unit)
+Slice::Gen::generate(const UnitPtr& p)
 {
-    unit->mergeModules();
+    p->mergeModules();
 
     //
     // TODO: It would be better if start() aligned the attributes
@@ -91,14 +91,14 @@ Slice::Gen::generate(const UnitPtr& unit)
     // TODO: schemaLocation?
     O << nl << "<xs:import namespace=\"http://www.zeroc.com/schemas\" schemaLocation=\"ice.xsd\"/>";
 
-    StringList includes = unit->includeFiles();
+    StringList includes = p->includeFiles();
     for(StringList::const_iterator q = includes.begin(); q != includes.end(); ++q)
     {
 	O << sp;
 	O << nl << "<xs:include schemaLocation=\"" << changeInclude(*q, _includePaths) << ".xsd\"/>";
     }
 
-    unit->visit(this);
+    p->visit(this);
 
     O << ee;
     O << nl;
diff --git a/cpp/src/slice2xsd/Main.cpp b/cpp/src/slice2xsd/Main.cpp
index ee774c30c5a..a7da7b102fc 100644
--- a/cpp/src/slice2xsd/Main.cpp
+++ b/cpp/src/slice2xsd/Main.cpp
@@ -178,12 +178,12 @@ main(int argc, char* argv[])
 	    return EXIT_FAILURE;
 	}
 
-	UnitPtr unit = Unit::createUnit(false, false, ice, caseSensitive);
-	int parseStatus = unit->parse(cppHandle, debug);
+	UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
+	int parseStatus = p->parse(cppHandle, debug);
 
 	if(!icecpp.close())
 	{
-	    unit->destroy();
+	    p->destroy();
 	    return EXIT_FAILURE;
 	}	    
 
@@ -196,13 +196,13 @@ main(int argc, char* argv[])
 	    Gen gen(argv[0], icecpp.getBaseName(), include, includePaths, output);
 	    if(!gen)
 	    {
-		unit->destroy();
+		p->destroy();
 		return EXIT_FAILURE;
 	    }
-	    gen.generate(unit);
+	    gen.generate(p);
 	}
 
-	unit->destroy();
+	p->destroy();
     }
 
     return status;