zeroc-ice 3.7.0 → 3.7.1

data/ext/ice/cpp/src/Ice/InstrumentationF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/InstrumentationI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/InstrumentationI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/LocalException.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -42,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -777,14 +777,14 @@ Ice::ResponseSentException::ice_staticId()
 
 #else // C++98 mapping
 
-Ice::InitializationException::InitializationException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::InitializationException::InitializationException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::InitializationException::InitializationException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::LocalException(file_, line_),
-    reason(iceP_reason)
+Ice::InitializationException::InitializationException(const char* file, int line, const ::std::string& reason) :
+    LocalException(file, line),
+    reason(reason)
 {
 }
 
@@ -810,14 +810,14 @@ Ice::InitializationException::ice_throw() const
     throw *this;
 }
 
-Ice::PluginInitializationException::PluginInitializationException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::PluginInitializationException::PluginInitializationException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::PluginInitializationException::PluginInitializationException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::LocalException(file_, line_),
-    reason(iceP_reason)
+Ice::PluginInitializationException::PluginInitializationException(const char* file, int line, const ::std::string& reason) :
+    LocalException(file, line),
+    reason(reason)
 {
 }
 
@@ -843,8 +843,8 @@ Ice::PluginInitializationException::ice_throw() const
     throw *this;
 }
 
-Ice::CollocationOptimizationException::CollocationOptimizationException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::CollocationOptimizationException::CollocationOptimizationException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -870,15 +870,15 @@ Ice::CollocationOptimizationException::ice_throw() const
     throw *this;
 }
 
-Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file_, int line_, const ::std::string& iceP_kindOfObject, const ::std::string& iceP_id) :
-    ::Ice::LocalException(file_, line_),
-    kindOfObject(iceP_kindOfObject),
-    id(iceP_id)
+Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) :
+    LocalException(file, line),
+    kindOfObject(kindOfObject),
+    id(id)
 {
 }
 
@@ -904,15 +904,15 @@ Ice::AlreadyRegisteredException::ice_throw() const
     throw *this;
 }
 
-Ice::NotRegisteredException::NotRegisteredException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::NotRegisteredException::NotRegisteredException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::NotRegisteredException::NotRegisteredException(const char* file_, int line_, const ::std::string& iceP_kindOfObject, const ::std::string& iceP_id) :
-    ::Ice::LocalException(file_, line_),
-    kindOfObject(iceP_kindOfObject),
-    id(iceP_id)
+Ice::NotRegisteredException::NotRegisteredException(const char* file, int line, const ::std::string& kindOfObject, const ::std::string& id) :
+    LocalException(file, line),
+    kindOfObject(kindOfObject),
+    id(id)
 {
 }
 
@@ -938,14 +938,14 @@ Ice::NotRegisteredException::ice_throw() const
     throw *this;
 }
 
-Ice::TwowayOnlyException::TwowayOnlyException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::TwowayOnlyException::TwowayOnlyException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::TwowayOnlyException::TwowayOnlyException(const char* file_, int line_, const ::std::string& iceP_operation) :
-    ::Ice::LocalException(file_, line_),
-    operation(iceP_operation)
+Ice::TwowayOnlyException::TwowayOnlyException(const char* file, int line, const ::std::string& operation) :
+    LocalException(file, line),
+    operation(operation)
 {
 }
 
@@ -971,8 +971,8 @@ Ice::TwowayOnlyException::ice_throw() const
     throw *this;
 }
 
-Ice::CloneNotImplementedException::CloneNotImplementedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::CloneNotImplementedException::CloneNotImplementedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -998,14 +998,14 @@ Ice::CloneNotImplementedException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownException::UnknownException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::UnknownException::UnknownException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::UnknownException::UnknownException(const char* file_, int line_, const ::std::string& iceP_unknown) :
-    ::Ice::LocalException(file_, line_),
-    unknown(iceP_unknown)
+Ice::UnknownException::UnknownException(const char* file, int line, const ::std::string& unknown) :
+    LocalException(file, line),
+    unknown(unknown)
 {
 }
 
@@ -1031,13 +1031,13 @@ Ice::UnknownException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownLocalException::UnknownLocalException(const char* file_, int line_) :
-    ::Ice::UnknownException(file_, line_)
+Ice::UnknownLocalException::UnknownLocalException(const char* file, int line) :
+    UnknownException(file, line)
 {
 }
 
-Ice::UnknownLocalException::UnknownLocalException(const char* file_, int line_, const ::std::string& iceP_unknown) :
-    ::Ice::UnknownException(file_, line_, iceP_unknown)
+Ice::UnknownLocalException::UnknownLocalException(const char* file, int line, const ::std::string& unknown) :
+    UnknownException(file, line, unknown)
 {
 }
 
@@ -1063,13 +1063,13 @@ Ice::UnknownLocalException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownUserException::UnknownUserException(const char* file_, int line_) :
-    ::Ice::UnknownException(file_, line_)
+Ice::UnknownUserException::UnknownUserException(const char* file, int line) :
+    UnknownException(file, line)
 {
 }
 
-Ice::UnknownUserException::UnknownUserException(const char* file_, int line_, const ::std::string& iceP_unknown) :
-    ::Ice::UnknownException(file_, line_, iceP_unknown)
+Ice::UnknownUserException::UnknownUserException(const char* file, int line, const ::std::string& unknown) :
+    UnknownException(file, line, unknown)
 {
 }
 
@@ -1095,8 +1095,8 @@ Ice::UnknownUserException::ice_throw() const
     throw *this;
 }
 
-Ice::VersionMismatchException::VersionMismatchException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::VersionMismatchException::VersionMismatchException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -1122,8 +1122,8 @@ Ice::VersionMismatchException::ice_throw() const
     throw *this;
 }
 
-Ice::CommunicatorDestroyedException::CommunicatorDestroyedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::CommunicatorDestroyedException::CommunicatorDestroyedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -1149,14 +1149,14 @@ Ice::CommunicatorDestroyedException::ice_throw() const
     throw *this;
 }
 
-Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file_, int line_, const ::std::string& iceP_name) :
-    ::Ice::LocalException(file_, line_),
-    name(iceP_name)
+Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* file, int line, const ::std::string& name) :
+    LocalException(file, line),
+    name(name)
 {
 }
 
@@ -1182,14 +1182,14 @@ Ice::ObjectAdapterDeactivatedException::ice_throw() const
     throw *this;
 }
 
-Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file_, int line_, const ::std::string& iceP_id) :
-    ::Ice::LocalException(file_, line_),
-    id(iceP_id)
+Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* file, int line, const ::std::string& id) :
+    LocalException(file, line),
+    id(id)
 {
 }
 
@@ -1215,14 +1215,14 @@ Ice::ObjectAdapterIdInUseException::ice_throw() const
     throw *this;
 }
 
-Ice::NoEndpointException::NoEndpointException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::NoEndpointException::NoEndpointException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::NoEndpointException::NoEndpointException(const char* file_, int line_, const ::std::string& iceP_proxy) :
-    ::Ice::LocalException(file_, line_),
-    proxy(iceP_proxy)
+Ice::NoEndpointException::NoEndpointException(const char* file, int line, const ::std::string& proxy) :
+    LocalException(file, line),
+    proxy(proxy)
 {
 }
 
@@ -1248,14 +1248,14 @@ Ice::NoEndpointException::ice_throw() const
     throw *this;
 }
 
-Ice::EndpointParseException::EndpointParseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::EndpointParseException::EndpointParseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::EndpointParseException::EndpointParseException(const char* file_, int line_, const ::std::string& iceP_str) :
-    ::Ice::LocalException(file_, line_),
-    str(iceP_str)
+Ice::EndpointParseException::EndpointParseException(const char* file, int line, const ::std::string& str) :
+    LocalException(file, line),
+    str(str)
 {
 }
 
@@ -1281,14 +1281,14 @@ Ice::EndpointParseException::ice_throw() const
     throw *this;
 }
 
-Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file_, int line_, const ::std::string& iceP_str) :
-    ::Ice::LocalException(file_, line_),
-    str(iceP_str)
+Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(const char* file, int line, const ::std::string& str) :
+    LocalException(file, line),
+    str(str)
 {
 }
 
@@ -1314,14 +1314,14 @@ Ice::EndpointSelectionTypeParseException::ice_throw() const
     throw *this;
 }
 
-Ice::VersionParseException::VersionParseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::VersionParseException::VersionParseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::VersionParseException::VersionParseException(const char* file_, int line_, const ::std::string& iceP_str) :
-    ::Ice::LocalException(file_, line_),
-    str(iceP_str)
+Ice::VersionParseException::VersionParseException(const char* file, int line, const ::std::string& str) :
+    LocalException(file, line),
+    str(str)
 {
 }
 
@@ -1347,14 +1347,14 @@ Ice::VersionParseException::ice_throw() const
     throw *this;
 }
 
-Ice::IdentityParseException::IdentityParseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::IdentityParseException::IdentityParseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::IdentityParseException::IdentityParseException(const char* file_, int line_, const ::std::string& iceP_str) :
-    ::Ice::LocalException(file_, line_),
-    str(iceP_str)
+Ice::IdentityParseException::IdentityParseException(const char* file, int line, const ::std::string& str) :
+    LocalException(file, line),
+    str(str)
 {
 }
 
@@ -1380,14 +1380,14 @@ Ice::IdentityParseException::ice_throw() const
     throw *this;
 }
 
-Ice::ProxyParseException::ProxyParseException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ProxyParseException::ProxyParseException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::ProxyParseException::ProxyParseException(const char* file_, int line_, const ::std::string& iceP_str) :
-    ::Ice::LocalException(file_, line_),
-    str(iceP_str)
+Ice::ProxyParseException::ProxyParseException(const char* file, int line, const ::std::string& str) :
+    LocalException(file, line),
+    str(str)
 {
 }
 
@@ -1413,14 +1413,14 @@ Ice::ProxyParseException::ice_throw() const
     throw *this;
 }
 
-Ice::IllegalIdentityException::IllegalIdentityException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::IllegalIdentityException::IllegalIdentityException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::IllegalIdentityException::IllegalIdentityException(const char* file_, int line_, const ::Ice::Identity& iceP_id) :
-    ::Ice::LocalException(file_, line_),
-    id(iceP_id)
+Ice::IllegalIdentityException::IllegalIdentityException(const char* file, int line, const Identity& id) :
+    LocalException(file, line),
+    id(id)
 {
 }
 
@@ -1446,14 +1446,14 @@ Ice::IllegalIdentityException::ice_throw() const
     throw *this;
 }
 
-Ice::IllegalServantException::IllegalServantException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::IllegalServantException::IllegalServantException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::IllegalServantException::IllegalServantException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::LocalException(file_, line_),
-    reason(iceP_reason)
+Ice::IllegalServantException::IllegalServantException(const char* file, int line, const ::std::string& reason) :
+    LocalException(file, line),
+    reason(reason)
 {
 }
 
@@ -1479,16 +1479,16 @@ Ice::IllegalServantException::ice_throw() const
     throw *this;
 }
 
-Ice::RequestFailedException::RequestFailedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::RequestFailedException::RequestFailedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::RequestFailedException::RequestFailedException(const char* file_, int line_, const ::Ice::Identity& iceP_id, const ::std::string& iceP_facet, const ::std::string& iceP_operation) :
-    ::Ice::LocalException(file_, line_),
-    id(iceP_id),
-    facet(iceP_facet),
-    operation(iceP_operation)
+Ice::RequestFailedException::RequestFailedException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
+    LocalException(file, line),
+    id(id),
+    facet(facet),
+    operation(operation)
 {
 }
 
@@ -1514,13 +1514,13 @@ Ice::RequestFailedException::ice_throw() const
     throw *this;
 }
 
-Ice::ObjectNotExistException::ObjectNotExistException(const char* file_, int line_) :
-    ::Ice::RequestFailedException(file_, line_)
+Ice::ObjectNotExistException::ObjectNotExistException(const char* file, int line) :
+    RequestFailedException(file, line)
 {
 }
 
-Ice::ObjectNotExistException::ObjectNotExistException(const char* file_, int line_, const ::Ice::Identity& iceP_id, const ::std::string& iceP_facet, const ::std::string& iceP_operation) :
-    ::Ice::RequestFailedException(file_, line_, iceP_id, iceP_facet, iceP_operation)
+Ice::ObjectNotExistException::ObjectNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
+    RequestFailedException(file, line, id, facet, operation)
 {
 }
 
@@ -1546,13 +1546,13 @@ Ice::ObjectNotExistException::ice_throw() const
     throw *this;
 }
 
-Ice::FacetNotExistException::FacetNotExistException(const char* file_, int line_) :
-    ::Ice::RequestFailedException(file_, line_)
+Ice::FacetNotExistException::FacetNotExistException(const char* file, int line) :
+    RequestFailedException(file, line)
 {
 }
 
-Ice::FacetNotExistException::FacetNotExistException(const char* file_, int line_, const ::Ice::Identity& iceP_id, const ::std::string& iceP_facet, const ::std::string& iceP_operation) :
-    ::Ice::RequestFailedException(file_, line_, iceP_id, iceP_facet, iceP_operation)
+Ice::FacetNotExistException::FacetNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
+    RequestFailedException(file, line, id, facet, operation)
 {
 }
 
@@ -1578,13 +1578,13 @@ Ice::FacetNotExistException::ice_throw() const
     throw *this;
 }
 
-Ice::OperationNotExistException::OperationNotExistException(const char* file_, int line_) :
-    ::Ice::RequestFailedException(file_, line_)
+Ice::OperationNotExistException::OperationNotExistException(const char* file, int line) :
+    RequestFailedException(file, line)
 {
 }
 
-Ice::OperationNotExistException::OperationNotExistException(const char* file_, int line_, const ::Ice::Identity& iceP_id, const ::std::string& iceP_facet, const ::std::string& iceP_operation) :
-    ::Ice::RequestFailedException(file_, line_, iceP_id, iceP_facet, iceP_operation)
+Ice::OperationNotExistException::OperationNotExistException(const char* file, int line, const Identity& id, const ::std::string& facet, const ::std::string& operation) :
+    RequestFailedException(file, line, id, facet, operation)
 {
 }
 
@@ -1610,15 +1610,15 @@ Ice::OperationNotExistException::ice_throw() const
     throw *this;
 }
 
-Ice::SyscallException::SyscallException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_),
+Ice::SyscallException::SyscallException(const char* file, int line) :
+    LocalException(file, line),
     error(0)
 {
 }
 
-Ice::SyscallException::SyscallException(const char* file_, int line_, ::Ice::Int iceP_error) :
-    ::Ice::LocalException(file_, line_),
-    error(iceP_error)
+Ice::SyscallException::SyscallException(const char* file, int line, Int error) :
+    LocalException(file, line),
+    error(error)
 {
 }
 
@@ -1644,13 +1644,13 @@ Ice::SyscallException::ice_throw() const
     throw *this;
 }
 
-Ice::SocketException::SocketException(const char* file_, int line_) :
-    ::Ice::SyscallException(file_, line_)
+Ice::SocketException::SocketException(const char* file, int line) :
+    SyscallException(file, line)
 {
 }
 
-Ice::SocketException::SocketException(const char* file_, int line_, ::Ice::Int iceP_error) :
-    ::Ice::SyscallException(file_, line_, iceP_error)
+Ice::SocketException::SocketException(const char* file, int line, Int error) :
+    SyscallException(file, line, error)
 {
 }
 
@@ -1676,14 +1676,14 @@ Ice::SocketException::ice_throw() const
     throw *this;
 }
 
-Ice::CFNetworkException::CFNetworkException(const char* file_, int line_) :
-    ::Ice::SocketException(file_, line_)
+Ice::CFNetworkException::CFNetworkException(const char* file, int line) :
+    SocketException(file, line)
 {
 }
 
-Ice::CFNetworkException::CFNetworkException(const char* file_, int line_, ::Ice::Int iceP_error, const ::std::string& iceP_domain) :
-    ::Ice::SocketException(file_, line_, iceP_error),
-    domain(iceP_domain)
+Ice::CFNetworkException::CFNetworkException(const char* file, int line, Int error, const ::std::string& domain) :
+    SocketException(file, line, error),
+    domain(domain)
 {
 }
 
@@ -1709,14 +1709,14 @@ Ice::CFNetworkException::ice_throw() const
     throw *this;
 }
 
-Ice::FileException::FileException(const char* file_, int line_) :
-    ::Ice::SyscallException(file_, line_)
+Ice::FileException::FileException(const char* file, int line) :
+    SyscallException(file, line)
 {
 }
 
-Ice::FileException::FileException(const char* file_, int line_, ::Ice::Int iceP_error, const ::std::string& iceP_path) :
-    ::Ice::SyscallException(file_, line_, iceP_error),
-    path(iceP_path)
+Ice::FileException::FileException(const char* file, int line, Int error, const ::std::string& path) :
+    SyscallException(file, line, error),
+    path(path)
 {
 }
 
@@ -1742,13 +1742,13 @@ Ice::FileException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectFailedException::ConnectFailedException(const char* file_, int line_) :
-    ::Ice::SocketException(file_, line_)
+Ice::ConnectFailedException::ConnectFailedException(const char* file, int line) :
+    SocketException(file, line)
 {
 }
 
-Ice::ConnectFailedException::ConnectFailedException(const char* file_, int line_, ::Ice::Int iceP_error) :
-    ::Ice::SocketException(file_, line_, iceP_error)
+Ice::ConnectFailedException::ConnectFailedException(const char* file, int line, Int error) :
+    SocketException(file, line, error)
 {
 }
 
@@ -1774,13 +1774,13 @@ Ice::ConnectFailedException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file_, int line_) :
-    ::Ice::ConnectFailedException(file_, line_)
+Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file, int line) :
+    ConnectFailedException(file, line)
 {
 }
 
-Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file_, int line_, ::Ice::Int iceP_error) :
-    ::Ice::ConnectFailedException(file_, line_, iceP_error)
+Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file, int line, Int error) :
+    ConnectFailedException(file, line, error)
 {
 }
 
@@ -1806,13 +1806,13 @@ Ice::ConnectionRefusedException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionLostException::ConnectionLostException(const char* file_, int line_) :
-    ::Ice::SocketException(file_, line_)
+Ice::ConnectionLostException::ConnectionLostException(const char* file, int line) :
+    SocketException(file, line)
 {
 }
 
-Ice::ConnectionLostException::ConnectionLostException(const char* file_, int line_, ::Ice::Int iceP_error) :
-    ::Ice::SocketException(file_, line_, iceP_error)
+Ice::ConnectionLostException::ConnectionLostException(const char* file, int line, Int error) :
+    SocketException(file, line, error)
 {
 }
 
@@ -1838,16 +1838,16 @@ Ice::ConnectionLostException::ice_throw() const
     throw *this;
 }
 
-Ice::DNSException::DNSException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_),
+Ice::DNSException::DNSException(const char* file, int line) :
+    LocalException(file, line),
     error(0)
 {
 }
 
-Ice::DNSException::DNSException(const char* file_, int line_, ::Ice::Int iceP_error, const ::std::string& iceP_host) :
-    ::Ice::LocalException(file_, line_),
-    error(iceP_error),
-    host(iceP_host)
+Ice::DNSException::DNSException(const char* file, int line, Int error, const ::std::string& host) :
+    LocalException(file, line),
+    error(error),
+    host(host)
 {
 }
 
@@ -1873,8 +1873,8 @@ Ice::DNSException::ice_throw() const
     throw *this;
 }
 
-Ice::OperationInterruptedException::OperationInterruptedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::OperationInterruptedException::OperationInterruptedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -1900,8 +1900,8 @@ Ice::OperationInterruptedException::ice_throw() const
     throw *this;
 }
 
-Ice::TimeoutException::TimeoutException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::TimeoutException::TimeoutException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -1927,8 +1927,8 @@ Ice::TimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectTimeoutException::ConnectTimeoutException(const char* file_, int line_) :
-    ::Ice::TimeoutException(file_, line_)
+Ice::ConnectTimeoutException::ConnectTimeoutException(const char* file, int line) :
+    TimeoutException(file, line)
 {
 }
 
@@ -1954,8 +1954,8 @@ Ice::ConnectTimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::CloseTimeoutException::CloseTimeoutException(const char* file_, int line_) :
-    ::Ice::TimeoutException(file_, line_)
+Ice::CloseTimeoutException::CloseTimeoutException(const char* file, int line) :
+    TimeoutException(file, line)
 {
 }
 
@@ -1981,8 +1981,8 @@ Ice::CloseTimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionTimeoutException::ConnectionTimeoutException(const char* file_, int line_) :
-    ::Ice::TimeoutException(file_, line_)
+Ice::ConnectionTimeoutException::ConnectionTimeoutException(const char* file, int line) :
+    TimeoutException(file, line)
 {
 }
 
@@ -2008,8 +2008,8 @@ Ice::ConnectionTimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::InvocationTimeoutException::InvocationTimeoutException(const char* file_, int line_) :
-    ::Ice::TimeoutException(file_, line_)
+Ice::InvocationTimeoutException::InvocationTimeoutException(const char* file, int line) :
+    TimeoutException(file, line)
 {
 }
 
@@ -2035,8 +2035,8 @@ Ice::InvocationTimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::InvocationCanceledException::InvocationCanceledException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::InvocationCanceledException::InvocationCanceledException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -2062,14 +2062,14 @@ Ice::InvocationCanceledException::ice_throw() const
     throw *this;
 }
 
-Ice::ProtocolException::ProtocolException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ProtocolException::ProtocolException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::ProtocolException::ProtocolException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::LocalException(file_, line_),
-    reason(iceP_reason)
+Ice::ProtocolException::ProtocolException(const char* file, int line, const ::std::string& reason) :
+    LocalException(file, line),
+    reason(reason)
 {
 }
 
@@ -2095,14 +2095,14 @@ Ice::ProtocolException::ice_throw() const
     throw *this;
 }
 
-Ice::BadMagicException::BadMagicException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::BadMagicException::BadMagicException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::BadMagicException::BadMagicException(const char* file_, int line_, const ::std::string& iceP_reason, const ::Ice::ByteSeq& iceP_badMagic) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason),
-    badMagic(iceP_badMagic)
+Ice::BadMagicException::BadMagicException(const char* file, int line, const ::std::string& reason, const ByteSeq& badMagic) :
+    ProtocolException(file, line, reason),
+    badMagic(badMagic)
 {
 }
 
@@ -2128,15 +2128,15 @@ Ice::BadMagicException::ice_throw() const
     throw *this;
 }
 
-Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file_, int line_, const ::std::string& iceP_reason, const ::Ice::ProtocolVersion& iceP_bad, const ::Ice::ProtocolVersion& iceP_supported) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason),
-    bad(iceP_bad),
-    supported(iceP_supported)
+Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file, int line, const ::std::string& reason, const ProtocolVersion& bad, const ProtocolVersion& supported) :
+    ProtocolException(file, line, reason),
+    bad(bad),
+    supported(supported)
 {
 }
 
@@ -2162,15 +2162,15 @@ Ice::UnsupportedProtocolException::ice_throw() const
     throw *this;
 }
 
-Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file_, int line_, const ::std::string& iceP_reason, const ::Ice::EncodingVersion& iceP_bad, const ::Ice::EncodingVersion& iceP_supported) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason),
-    bad(iceP_bad),
-    supported(iceP_supported)
+Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file, int line, const ::std::string& reason, const EncodingVersion& bad, const EncodingVersion& supported) :
+    ProtocolException(file, line, reason),
+    bad(bad),
+    supported(supported)
 {
 }
 
@@ -2196,13 +2196,13 @@ Ice::UnsupportedEncodingException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownMessageException::UnknownMessageException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::UnknownMessageException::UnknownMessageException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::UnknownMessageException::UnknownMessageException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::UnknownMessageException::UnknownMessageException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2228,13 +2228,13 @@ Ice::UnknownMessageException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2260,13 +2260,13 @@ Ice::ConnectionNotValidatedException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2292,13 +2292,13 @@ Ice::UnknownRequestIdException::ice_throw() const
     throw *this;
 }
 
-Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2324,13 +2324,13 @@ Ice::UnknownReplyStatusException::ice_throw() const
     throw *this;
 }
 
-Ice::CloseConnectionException::CloseConnectionException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::CloseConnectionException::CloseConnectionException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::CloseConnectionException::CloseConnectionException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::CloseConnectionException::CloseConnectionException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2356,14 +2356,14 @@ Ice::CloseConnectionException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file_, int line_, bool iceP_graceful) :
-    ::Ice::LocalException(file_, line_),
-    graceful(iceP_graceful)
+Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const char* file, int line, bool graceful) :
+    LocalException(file, line),
+    graceful(graceful)
 {
 }
 
@@ -2389,13 +2389,13 @@ Ice::ConnectionManuallyClosedException::ice_throw() const
     throw *this;
 }
 
-Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2421,13 +2421,13 @@ Ice::IllegalMessageSizeException::ice_throw() const
     throw *this;
 }
 
-Ice::CompressionException::CompressionException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::CompressionException::CompressionException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::CompressionException::CompressionException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::CompressionException::CompressionException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2453,13 +2453,13 @@ Ice::CompressionException::ice_throw() const
     throw *this;
 }
 
-Ice::DatagramLimitException::DatagramLimitException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::DatagramLimitException::DatagramLimitException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::DatagramLimitException::DatagramLimitException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::DatagramLimitException::DatagramLimitException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2485,13 +2485,13 @@ Ice::DatagramLimitException::ice_throw() const
     throw *this;
 }
 
-Ice::MarshalException::MarshalException(const char* file_, int line_) :
-    ::Ice::ProtocolException(file_, line_)
+Ice::MarshalException::MarshalException(const char* file, int line) :
+    ProtocolException(file, line)
 {
 }
 
-Ice::MarshalException::MarshalException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::ProtocolException(file_, line_, iceP_reason)
+Ice::MarshalException::MarshalException(const char* file, int line, const ::std::string& reason) :
+    ProtocolException(file, line, reason)
 {
 }
 
@@ -2517,13 +2517,13 @@ Ice::MarshalException::ice_throw() const
     throw *this;
 }
 
-Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::MarshalException(file_, line_, iceP_reason)
+Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file, int line, const ::std::string& reason) :
+    MarshalException(file, line, reason)
 {
 }
 
@@ -2549,13 +2549,13 @@ Ice::ProxyUnmarshalException::ice_throw() const
     throw *this;
 }
 
-Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::MarshalException(file_, line_, iceP_reason)
+Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* file, int line, const ::std::string& reason) :
+    MarshalException(file, line, reason)
 {
 }
 
@@ -2581,14 +2581,14 @@ Ice::UnmarshalOutOfBoundsException::ice_throw() const
     throw *this;
 }
 
-Ice::NoValueFactoryException::NoValueFactoryException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::NoValueFactoryException::NoValueFactoryException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::NoValueFactoryException::NoValueFactoryException(const char* file_, int line_, const ::std::string& iceP_reason, const ::std::string& iceP_type) :
-    ::Ice::MarshalException(file_, line_, iceP_reason),
-    type(iceP_type)
+Ice::NoValueFactoryException::NoValueFactoryException(const char* file, int line, const ::std::string& reason, const ::std::string& type) :
+    MarshalException(file, line, reason),
+    type(type)
 {
 }
 
@@ -2614,15 +2614,15 @@ Ice::NoValueFactoryException::ice_throw() const
     throw *this;
 }
 
-Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file_, int line_, const ::std::string& iceP_reason, const ::std::string& iceP_type, const ::std::string& iceP_expectedType) :
-    ::Ice::MarshalException(file_, line_, iceP_reason),
-    type(iceP_type),
-    expectedType(iceP_expectedType)
+Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file, int line, const ::std::string& reason, const ::std::string& type, const ::std::string& expectedType) :
+    MarshalException(file, line, reason),
+    type(type),
+    expectedType(expectedType)
 {
 }
 
@@ -2648,13 +2648,13 @@ Ice::UnexpectedObjectException::ice_throw() const
     throw *this;
 }
 
-Ice::MemoryLimitException::MemoryLimitException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::MemoryLimitException::MemoryLimitException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::MemoryLimitException::MemoryLimitException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::MarshalException(file_, line_, iceP_reason)
+Ice::MemoryLimitException::MemoryLimitException(const char* file, int line, const ::std::string& reason) :
+    MarshalException(file, line, reason)
 {
 }
 
@@ -2680,13 +2680,13 @@ Ice::MemoryLimitException::ice_throw() const
     throw *this;
 }
 
-Ice::StringConversionException::StringConversionException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::StringConversionException::StringConversionException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::StringConversionException::StringConversionException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::MarshalException(file_, line_, iceP_reason)
+Ice::StringConversionException::StringConversionException(const char* file, int line, const ::std::string& reason) :
+    MarshalException(file, line, reason)
 {
 }
 
@@ -2712,13 +2712,13 @@ Ice::StringConversionException::ice_throw() const
     throw *this;
 }
 
-Ice::EncapsulationException::EncapsulationException(const char* file_, int line_) :
-    ::Ice::MarshalException(file_, line_)
+Ice::EncapsulationException::EncapsulationException(const char* file, int line) :
+    MarshalException(file, line)
 {
 }
 
-Ice::EncapsulationException::EncapsulationException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::MarshalException(file_, line_, iceP_reason)
+Ice::EncapsulationException::EncapsulationException(const char* file, int line, const ::std::string& reason) :
+    MarshalException(file, line, reason)
 {
 }
 
@@ -2744,14 +2744,14 @@ Ice::EncapsulationException::ice_throw() const
     throw *this;
 }
 
-Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file_, int line_, const ::std::string& iceP_unsupportedFeature) :
-    ::Ice::LocalException(file_, line_),
-    unsupportedFeature(iceP_unsupportedFeature)
+Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file, int line, const ::std::string& unsupportedFeature) :
+    LocalException(file, line),
+    unsupportedFeature(unsupportedFeature)
 {
 }
 
@@ -2777,14 +2777,14 @@ Ice::FeatureNotSupportedException::ice_throw() const
     throw *this;
 }
 
-Ice::SecurityException::SecurityException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::SecurityException::SecurityException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
-Ice::SecurityException::SecurityException(const char* file_, int line_, const ::std::string& iceP_reason) :
-    ::Ice::LocalException(file_, line_),
-    reason(iceP_reason)
+Ice::SecurityException::SecurityException(const char* file, int line, const ::std::string& reason) :
+    LocalException(file, line),
+    reason(reason)
 {
 }
 
@@ -2810,8 +2810,8 @@ Ice::SecurityException::ice_throw() const
     throw *this;
 }
 
-Ice::FixedProxyException::FixedProxyException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::FixedProxyException::FixedProxyException(const char* file, int line) :
+    LocalException(file, line)
 {
 }
 
@@ -2837,8 +2837,8 @@ Ice::FixedProxyException::ice_throw() const
     throw *this;
 }
 
-Ice::ResponseSentException::ResponseSentException(const char* file_, int line_) :
-    ::Ice::LocalException(file_, line_)
+Ice::ResponseSentException::ResponseSentException(const char* file, int line) :
+    LocalException(file, line)
 {
 }