zeroc-ice 3.6.1 → 3.6.2

data/ext/ice/cpp/include/Ice/IncomingAsync.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/IncomingAsyncF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Initialize.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.
@@ -125,6 +125,8 @@ ICE_API void setProcessLogger(const LoggerPtr&);
 typedef Ice::Plugin* (*PLUGIN_FACTORY)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
 ICE_API void registerPluginFactory(const std::string&, PLUGIN_FACTORY, bool);
 
+ICE_API Identity stringToIdentity(const std::string&);
+ICE_API std::string identityToString(const Identity&);
 }
 
 namespace IceInternal

data/ext/ice/cpp/include/Ice/InstanceF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Instrumentation.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -41,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -63,62 +63,42 @@ namespace Instrumentation
 {
 
 class Observer;
-bool operator==(const Observer&, const Observer&);
-bool operator<(const Observer&, const Observer&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::Observer*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::Observer> ObserverPtr;
 
 class ThreadObserver;
-bool operator==(const ThreadObserver&, const ThreadObserver&);
-bool operator<(const ThreadObserver&, const ThreadObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::ThreadObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::ThreadObserver> ThreadObserverPtr;
 
 class ConnectionObserver;
-bool operator==(const ConnectionObserver&, const ConnectionObserver&);
-bool operator<(const ConnectionObserver&, const ConnectionObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::ConnectionObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::ConnectionObserver> ConnectionObserverPtr;
 
 class DispatchObserver;
-bool operator==(const DispatchObserver&, const DispatchObserver&);
-bool operator<(const DispatchObserver&, const DispatchObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::DispatchObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::DispatchObserver> DispatchObserverPtr;
 
 class ChildInvocationObserver;
-bool operator==(const ChildInvocationObserver&, const ChildInvocationObserver&);
-bool operator<(const ChildInvocationObserver&, const ChildInvocationObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::ChildInvocationObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::ChildInvocationObserver> ChildInvocationObserverPtr;
 
 class RemoteObserver;
-bool operator==(const RemoteObserver&, const RemoteObserver&);
-bool operator<(const RemoteObserver&, const RemoteObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::RemoteObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::RemoteObserver> RemoteObserverPtr;
 
 class CollocatedObserver;
-bool operator==(const CollocatedObserver&, const CollocatedObserver&);
-bool operator<(const CollocatedObserver&, const CollocatedObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::CollocatedObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::CollocatedObserver> CollocatedObserverPtr;
 
 class InvocationObserver;
-bool operator==(const InvocationObserver&, const InvocationObserver&);
-bool operator<(const InvocationObserver&, const InvocationObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::InvocationObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::InvocationObserver> InvocationObserverPtr;
 
 class ObserverUpdater;
-bool operator==(const ObserverUpdater&, const ObserverUpdater&);
-bool operator<(const ObserverUpdater&, const ObserverUpdater&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::ObserverUpdater*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::ObserverUpdater> ObserverUpdaterPtr;
 
 class CommunicatorObserver;
-bool operator==(const CommunicatorObserver&, const CommunicatorObserver&);
-bool operator<(const CommunicatorObserver&, const CommunicatorObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::CommunicatorObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::CommunicatorObserver> CommunicatorObserverPtr;
 

data/ext/ice/cpp/include/Ice/InstrumentationF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -60,14 +60,10 @@ namespace Instrumentation
 {
 
 class Observer;
-bool operator==(const Observer&, const Observer&);
-bool operator<(const Observer&, const Observer&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::Observer*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::Observer> ObserverPtr;
 
 class CommunicatorObserver;
-bool operator==(const CommunicatorObserver&, const CommunicatorObserver&);
-bool operator<(const CommunicatorObserver&, const CommunicatorObserver&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Instrumentation::CommunicatorObserver*);
 typedef ::IceInternal::Handle< ::Ice::Instrumentation::CommunicatorObserver> CommunicatorObserverPtr;
 

data/ext/ice/cpp/include/Ice/LocalException.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -41,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/Ice/LocalObject.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/LocalObjectF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Locator.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -47,7 +47,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -88,24 +88,18 @@ namespace Ice
 {
 
 class LocatorRegistry;
-bool operator==(const LocatorRegistry&, const LocatorRegistry&);
-bool operator<(const LocatorRegistry&, const LocatorRegistry&);
 ICE_API ::Ice::Object* upCast(::Ice::LocatorRegistry*);
 typedef ::IceInternal::Handle< ::Ice::LocatorRegistry> LocatorRegistryPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry> LocatorRegistryPrx;
 ICE_API void __patch(LocatorRegistryPtr&, const ::Ice::ObjectPtr&);
 
 class Locator;
-bool operator==(const Locator&, const Locator&);
-bool operator<(const Locator&, const Locator&);
 ICE_API ::Ice::Object* upCast(::Ice::Locator*);
 typedef ::IceInternal::Handle< ::Ice::Locator> LocatorPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
 ICE_API void __patch(LocatorPtr&, const ::Ice::ObjectPtr&);
 
 class LocatorFinder;
-bool operator==(const LocatorFinder&, const LocatorFinder&);
-bool operator<(const LocatorFinder&, const LocatorFinder&);
 ICE_API ::Ice::Object* upCast(::Ice::LocatorFinder*);
 typedef ::IceInternal::Handle< ::Ice::LocatorFinder> LocatorFinderPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorFinder> LocatorFinderPrx;

data/ext/ice/cpp/include/Ice/LocatorF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -39,7 +39,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -76,16 +76,12 @@ namespace Ice
 {
 
 class Locator;
-bool operator==(const Locator&, const Locator&);
-bool operator<(const Locator&, const Locator&);
 ICE_API ::Ice::Object* upCast(::Ice::Locator*);
 typedef ::IceInternal::Handle< ::Ice::Locator> LocatorPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
 ICE_API void __patch(LocatorPtr&, const ::Ice::ObjectPtr&);
 
 class LocatorRegistry;
-bool operator==(const LocatorRegistry&, const LocatorRegistry&);
-bool operator<(const LocatorRegistry&, const LocatorRegistry&);
 ICE_API ::Ice::Object* upCast(::Ice::LocatorRegistry*);
 typedef ::IceInternal::Handle< ::Ice::LocatorRegistry> LocatorRegistryPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry> LocatorRegistryPrx;

data/ext/ice/cpp/include/Ice/Logger.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -57,8 +57,6 @@ namespace Ice
 {
 
 class Logger;
-bool operator==(const Logger&, const Logger&);
-bool operator<(const Logger&, const Logger&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Logger*);
 typedef ::IceInternal::Handle< ::Ice::Logger> LoggerPtr;
 

data/ext/ice/cpp/include/Ice/LoggerF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -57,8 +57,6 @@ namespace Ice
 {
 
 class Logger;
-bool operator==(const Logger&, const Logger&);
-bool operator<(const Logger&, const Logger&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Logger*);
 typedef ::IceInternal::Handle< ::Ice::Logger> LoggerPtr;
 

data/ext/ice/cpp/include/Ice/LoggerUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Metrics.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -45,7 +45,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -110,72 +110,54 @@ namespace IceMX
 {
 
 class Metrics;
-bool operator==(const Metrics&, const Metrics&);
-bool operator<(const Metrics&, const Metrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::Metrics*);
 typedef ::IceInternal::Handle< ::IceMX::Metrics> MetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::Metrics> MetricsPrx;
 ICE_API void __patch(MetricsPtr&, const ::Ice::ObjectPtr&);
 
 class MetricsAdmin;
-bool operator==(const MetricsAdmin&, const MetricsAdmin&);
-bool operator<(const MetricsAdmin&, const MetricsAdmin&);
 ICE_API ::Ice::Object* upCast(::IceMX::MetricsAdmin*);
 typedef ::IceInternal::Handle< ::IceMX::MetricsAdmin> MetricsAdminPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::MetricsAdmin> MetricsAdminPrx;
 ICE_API void __patch(MetricsAdminPtr&, const ::Ice::ObjectPtr&);
 
 class ThreadMetrics;
-bool operator==(const ThreadMetrics&, const ThreadMetrics&);
-bool operator<(const ThreadMetrics&, const ThreadMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::ThreadMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::ThreadMetrics> ThreadMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ThreadMetrics> ThreadMetricsPrx;
 ICE_API void __patch(ThreadMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class DispatchMetrics;
-bool operator==(const DispatchMetrics&, const DispatchMetrics&);
-bool operator<(const DispatchMetrics&, const DispatchMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::DispatchMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::DispatchMetrics> DispatchMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::DispatchMetrics> DispatchMetricsPrx;
 ICE_API void __patch(DispatchMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class ChildInvocationMetrics;
-bool operator==(const ChildInvocationMetrics&, const ChildInvocationMetrics&);
-bool operator<(const ChildInvocationMetrics&, const ChildInvocationMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::ChildInvocationMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::ChildInvocationMetrics> ChildInvocationMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ChildInvocationMetrics> ChildInvocationMetricsPrx;
 ICE_API void __patch(ChildInvocationMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class CollocatedMetrics;
-bool operator==(const CollocatedMetrics&, const CollocatedMetrics&);
-bool operator<(const CollocatedMetrics&, const CollocatedMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::CollocatedMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::CollocatedMetrics> CollocatedMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::CollocatedMetrics> CollocatedMetricsPrx;
 ICE_API void __patch(CollocatedMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class RemoteMetrics;
-bool operator==(const RemoteMetrics&, const RemoteMetrics&);
-bool operator<(const RemoteMetrics&, const RemoteMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::RemoteMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::RemoteMetrics> RemoteMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::RemoteMetrics> RemoteMetricsPrx;
 ICE_API void __patch(RemoteMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class InvocationMetrics;
-bool operator==(const InvocationMetrics&, const InvocationMetrics&);
-bool operator<(const InvocationMetrics&, const InvocationMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::InvocationMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::InvocationMetrics> InvocationMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::InvocationMetrics> InvocationMetricsPrx;
 ICE_API void __patch(InvocationMetricsPtr&, const ::Ice::ObjectPtr&);
 
 class ConnectionMetrics;
-bool operator==(const ConnectionMetrics&, const ConnectionMetrics&);
-bool operator<(const ConnectionMetrics&, const ConnectionMetrics&);
 ICE_API ::Ice::Object* upCast(::IceMX::ConnectionMetrics*);
 typedef ::IceInternal::Handle< ::IceMX::ConnectionMetrics> ConnectionMetricsPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::IceMX::ConnectionMetrics> ConnectionMetricsPrx;
@@ -1843,13 +1825,17 @@ public:
     ::Ice::Long totalLifetime;
 
     ::Ice::Int failures;
-
 protected:
 
     virtual ~Metrics() {}
 
-    friend class Metrics__staticInit;
+friend class Metrics__staticInit;
 };
+#if !defined(_MSC_VER) || (_MSC_VER < 1900)
+//
+// COMPILERFIX: Visual Studio 2015 update 1 fails to access
+// the proected destructor from a friend class.
+//
 
 class Metrics__staticInit
 {
@@ -1859,6 +1845,9 @@ public:
 };
 
 static Metrics__staticInit _Metrics_init;
+#else
+static auto _Metrics_init = ::IceMX::Metrics::ice_factory;
+#endif
 
 inline bool operator==(const Metrics& l, const Metrics& r)
 {
@@ -1964,7 +1953,6 @@ public:
     ::Ice::Int inUseForUser;
 
     ::Ice::Int inUseForOther;
-
 protected:
 
     virtual ~ThreadMetrics() {}
@@ -2025,7 +2013,6 @@ public:
     ::Ice::Long size;
 
     ::Ice::Long replySize;
-
 protected:
 
     virtual ~DispatchMetrics() {}
@@ -2082,7 +2069,6 @@ public:
     ::Ice::Long size;
 
     ::Ice::Long replySize;
-
 protected:
 
     virtual ~ChildInvocationMetrics() {}
@@ -2234,7 +2220,6 @@ public:
     ::IceMX::MetricsMap remotes;
 
     ::IceMX::MetricsMap collocated;
-
 protected:
 
     virtual ~InvocationMetrics() {}
@@ -2291,7 +2276,6 @@ public:
     ::Ice::Long receivedBytes;
 
     ::Ice::Long sentBytes;
-
 protected:
 
     virtual ~ConnectionMetrics() {}