summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
committerJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
commit7a7d495fb0c5a63e404eb62a0461bbafb06d6175 (patch)
treee0877720ce67950b8b0eaaef410631013c3cf2a4 /cpp/src
parentRemove anonymous cipher usage in IceSSL/configuration (diff)
downloadice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.bz2
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.xz
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.zip
Copyright header simplication
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Blobject.cpp4
-rw-r--r--cpp/src/Glacier2/Blobject.h4
-rw-r--r--cpp/src/Glacier2/ClientBlobject.cpp4
-rw-r--r--cpp/src/Glacier2/ClientBlobject.h4
-rw-r--r--cpp/src/Glacier2/FilterI.cpp4
-rw-r--r--cpp/src/Glacier2/FilterI.h4
-rw-r--r--cpp/src/Glacier2/FilterManager.cpp4
-rw-r--r--cpp/src/Glacier2/FilterManager.h4
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp4
-rw-r--r--cpp/src/Glacier2/Instance.cpp4
-rw-r--r--cpp/src/Glacier2/Instance.h4
-rw-r--r--cpp/src/Glacier2/Instrumentation.ice4
-rw-r--r--cpp/src/Glacier2/InstrumentationI.cpp4
-rw-r--r--cpp/src/Glacier2/InstrumentationI.h4
-rw-r--r--cpp/src/Glacier2/Makefile.mk4
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.cpp4
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.h4
-rw-r--r--cpp/src/Glacier2/RequestQueue.cpp4
-rw-r--r--cpp/src/Glacier2/RequestQueue.h4
-rw-r--r--cpp/src/Glacier2/RouterI.cpp4
-rw-r--r--cpp/src/Glacier2/RouterI.h4
-rw-r--r--cpp/src/Glacier2/RoutingTable.cpp4
-rw-r--r--cpp/src/Glacier2/RoutingTable.h4
-rw-r--r--cpp/src/Glacier2/ServerBlobject.cpp4
-rw-r--r--cpp/src/Glacier2/ServerBlobject.h4
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp4
-rw-r--r--cpp/src/Glacier2/SessionRouterI.h4
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp4
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk4
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp4
-rw-r--r--cpp/src/Glacier2Lib/Makefile.mk4
-rw-r--r--cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp4
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp4
-rw-r--r--cpp/src/Ice/ACM.cpp4
-rw-r--r--cpp/src/Ice/ACM.h4
-rw-r--r--cpp/src/Ice/ACMF.h4
-rw-r--r--cpp/src/Ice/Acceptor.cpp4
-rw-r--r--cpp/src/Ice/Acceptor.h4
-rw-r--r--cpp/src/Ice/AcceptorF.h4
-rw-r--r--cpp/src/Ice/Application.cpp4
-rw-r--r--cpp/src/Ice/ArgVector.cpp4
-rw-r--r--cpp/src/Ice/ArgVector.h4
-rw-r--r--cpp/src/Ice/AsyncResult.cpp4
-rw-r--r--cpp/src/Ice/Base64.cpp4
-rw-r--r--cpp/src/Ice/Base64.h4
-rw-r--r--cpp/src/Ice/BatchRequestQueue.cpp4
-rw-r--r--cpp/src/Ice/BatchRequestQueue.h4
-rw-r--r--cpp/src/Ice/Buffer.cpp4
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.h4
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp4
-rw-r--r--cpp/src/Ice/CommunicatorI.h4
-rw-r--r--cpp/src/Ice/Cond.cpp4
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.h4
-rw-r--r--cpp/src/Ice/ConnectRequestHandlerF.h4
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp4
-rw-r--r--cpp/src/Ice/ConnectionFactory.h4
-rw-r--r--cpp/src/Ice/ConnectionFactoryF.h4
-rw-r--r--cpp/src/Ice/ConnectionI.cpp4
-rw-r--r--cpp/src/Ice/ConnectionI.h4
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.cpp4
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.h4
-rw-r--r--cpp/src/Ice/Connector.cpp4
-rw-r--r--cpp/src/Ice/Connector.h4
-rw-r--r--cpp/src/Ice/ConnectorF.h4
-rw-r--r--cpp/src/Ice/CountDownLatch.cpp4
-rw-r--r--cpp/src/Ice/DLLMain.cpp4
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp4
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h4
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h4
-rw-r--r--cpp/src/Ice/DispatchInterceptor.cpp4
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactory.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryF.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp4
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h4
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h4
-rw-r--r--cpp/src/Ice/EndpointI.cpp4
-rw-r--r--cpp/src/Ice/EndpointI.h4
-rw-r--r--cpp/src/Ice/EndpointIF.h4
-rw-r--r--cpp/src/Ice/EventHandler.cpp4
-rw-r--r--cpp/src/Ice/EventHandler.h4
-rw-r--r--cpp/src/Ice/EventHandlerF.h4
-rwxr-xr-xcpp/src/Ice/EventLoggerMsg.mc4
-rw-r--r--cpp/src/Ice/Exception.cpp4
-rw-r--r--cpp/src/Ice/FactoryTable.cpp4
-rw-r--r--cpp/src/Ice/FactoryTableInit.cpp4
-rw-r--r--cpp/src/Ice/GCObject.cpp4
-rw-r--r--cpp/src/Ice/HashUtil.h4
-rw-r--r--cpp/src/Ice/HttpParser.cpp4
-rw-r--r--cpp/src/Ice/HttpParser.h4
-rw-r--r--cpp/src/Ice/IPEndpointI.cpp4
-rw-r--r--cpp/src/Ice/IPEndpointI.h4
-rw-r--r--cpp/src/Ice/IPEndpointIF.h4
-rw-r--r--cpp/src/Ice/IconvStringConverter.cpp4
-rw-r--r--cpp/src/Ice/ImplicitContextI.cpp4
-rw-r--r--cpp/src/Ice/ImplicitContextI.h4
-rw-r--r--cpp/src/Ice/Incoming.cpp4
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp4
-rw-r--r--cpp/src/Ice/IncomingRequest.h4
-rw-r--r--cpp/src/Ice/Initialize.cpp4
-rw-r--r--cpp/src/Ice/InputStream.cpp4
-rw-r--r--cpp/src/Ice/Instance.cpp4
-rw-r--r--cpp/src/Ice/Instance.h4
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp4
-rw-r--r--cpp/src/Ice/InstrumentationI.h4
-rw-r--r--cpp/src/Ice/LocalObject.cpp4
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp4
-rw-r--r--cpp/src/Ice/LocatorInfo.h4
-rw-r--r--cpp/src/Ice/LocatorInfoF.h4
-rw-r--r--cpp/src/Ice/LoggerAdminI.cpp4
-rw-r--r--cpp/src/Ice/LoggerAdminI.h4
-rw-r--r--cpp/src/Ice/LoggerI.cpp4
-rw-r--r--cpp/src/Ice/LoggerI.h4
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp4
-rw-r--r--cpp/src/Ice/Makefile.mk4
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp4
-rw-r--r--cpp/src/Ice/MetricsObserverI.cpp4
-rwxr-xr-xcpp/src/Ice/Network.cpp4
-rwxr-xr-xcpp/src/Ice/Network.h4
-rw-r--r--cpp/src/Ice/NetworkF.h4
-rw-r--r--cpp/src/Ice/NetworkProxy.cpp4
-rw-r--r--cpp/src/Ice/NetworkProxy.h4
-rw-r--r--cpp/src/Ice/NetworkProxyF.h4
-rw-r--r--cpp/src/Ice/Object.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h4
-rw-r--r--cpp/src/Ice/ObjectAdapterFactoryF.h4
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp4
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h4
-rw-r--r--cpp/src/Ice/ObserverHelper.cpp4
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.cpp4
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.h4
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp4
-rw-r--r--cpp/src/Ice/OutputStream.cpp4
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp4
-rw-r--r--cpp/src/Ice/PluginManagerI.h4
-rw-r--r--cpp/src/Ice/PropertiesAdminI.cpp4
-rw-r--r--cpp/src/Ice/PropertiesAdminI.h4
-rw-r--r--cpp/src/Ice/PropertiesI.cpp4
-rw-r--r--cpp/src/Ice/PropertiesI.h4
-rw-r--r--cpp/src/Ice/PropertyNames.cpp4
-rw-r--r--cpp/src/Ice/PropertyNames.h4
-rw-r--r--cpp/src/Ice/Protocol.cpp4
-rw-r--r--cpp/src/Ice/ProtocolInstance.cpp4
-rw-r--r--cpp/src/Ice/ProtocolInstance.h4
-rw-r--r--cpp/src/Ice/ProtocolInstanceF.h4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.h4
-rw-r--r--cpp/src/Ice/ProtocolPluginFacadeF.h4
-rw-r--r--cpp/src/Ice/Proxy.cpp4
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp4
-rw-r--r--cpp/src/Ice/ProxyFactory.h4
-rw-r--r--cpp/src/Ice/Reference.cpp4
-rw-r--r--cpp/src/Ice/Reference.h4
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp4
-rw-r--r--cpp/src/Ice/ReferenceFactory.h4
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h4
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.cpp4
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.h4
-rw-r--r--cpp/src/Ice/ReplyStatus.h4
-rw-r--r--cpp/src/Ice/RequestHandler.cpp4
-rw-r--r--cpp/src/Ice/RequestHandler.h4
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.cpp4
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.h4
-rw-r--r--cpp/src/Ice/ResponseHandler.cpp4
-rw-r--r--cpp/src/Ice/ResponseHandler.h4
-rw-r--r--cpp/src/Ice/RetryQueue.cpp4
-rw-r--r--cpp/src/Ice/RetryQueue.h4
-rw-r--r--cpp/src/Ice/RetryQueueF.h4
-rw-r--r--cpp/src/Ice/RouterInfo.cpp4
-rw-r--r--cpp/src/Ice/RouterInfo.h4
-rw-r--r--cpp/src/Ice/RouterInfoF.h4
-rw-r--r--cpp/src/Ice/SHA1.cpp4
-rw-r--r--cpp/src/Ice/Selector.cpp4
-rw-r--r--cpp/src/Ice/Selector.h4
-rw-r--r--cpp/src/Ice/ServantManager.cpp4
-rw-r--r--cpp/src/Ice/ServantManager.h4
-rw-r--r--cpp/src/Ice/Service.cpp4
-rw-r--r--cpp/src/Ice/SharedContext.h4
-rw-r--r--cpp/src/Ice/SliceChecksums.cpp4
-rw-r--r--cpp/src/Ice/SlicedData.cpp4
-rwxr-xr-xcpp/src/Ice/StreamSocket.cpp4
-rw-r--r--cpp/src/Ice/StreamSocket.h4
-rw-r--r--cpp/src/Ice/StringConverterPlugin.cpp4
-rw-r--r--cpp/src/Ice/StringUtil.h4
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp4
-rw-r--r--cpp/src/Ice/SysLoggerI.h4
-rw-r--r--cpp/src/Ice/SystemdJournalI.cpp4
-rw-r--r--cpp/src/Ice/SystemdJournalI.h4
-rwxr-xr-xcpp/src/Ice/TcpAcceptor.cpp4
-rw-r--r--cpp/src/Ice/TcpAcceptor.h4
-rw-r--r--cpp/src/Ice/TcpConnector.cpp4
-rw-r--r--cpp/src/Ice/TcpConnector.h4
-rw-r--r--cpp/src/Ice/TcpEndpointI.cpp4
-rw-r--r--cpp/src/Ice/TcpEndpointI.h4
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp4
-rw-r--r--cpp/src/Ice/TcpTransceiver.h4
-rw-r--r--cpp/src/Ice/Thread.cpp4
-rw-r--r--cpp/src/Ice/ThreadPool.cpp4
-rw-r--r--cpp/src/Ice/ThreadPool.h4
-rw-r--r--cpp/src/Ice/Timer.cpp4
-rw-r--r--cpp/src/Ice/TraceLevels.cpp4
-rw-r--r--cpp/src/Ice/TraceLevels.h4
-rw-r--r--cpp/src/Ice/TraceLevelsF.h4
-rw-r--r--cpp/src/Ice/TraceUtil.cpp4
-rw-r--r--cpp/src/Ice/TraceUtil.h4
-rw-r--r--cpp/src/Ice/Transceiver.cpp4
-rw-r--r--cpp/src/Ice/Transceiver.h4
-rw-r--r--cpp/src/Ice/TransceiverF.h4
-rw-r--r--cpp/src/Ice/UdpConnector.cpp4
-rw-r--r--cpp/src/Ice/UdpConnector.h4
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp4
-rw-r--r--cpp/src/Ice/UdpEndpointI.h4
-rwxr-xr-xcpp/src/Ice/UdpTransceiver.cpp4
-rw-r--r--cpp/src/Ice/UdpTransceiver.h4
-rw-r--r--cpp/src/Ice/Value.cpp4
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.cpp4
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.h4
-rw-r--r--cpp/src/Ice/VirtualShared.h4
-rw-r--r--cpp/src/Ice/WSAcceptor.cpp4
-rw-r--r--cpp/src/Ice/WSAcceptor.h4
-rw-r--r--cpp/src/Ice/WSConnector.cpp4
-rw-r--r--cpp/src/Ice/WSConnector.h4
-rw-r--r--cpp/src/Ice/WSEndpoint.cpp4
-rw-r--r--cpp/src/Ice/WSEndpoint.h4
-rw-r--r--cpp/src/Ice/WSTransceiver.cpp4
-rw-r--r--cpp/src/Ice/WSTransceiver.h4
-rw-r--r--cpp/src/Ice/ios/Notifications.mm4
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.h4
-rw-r--r--cpp/src/Ice/ios/StreamConnector.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamConnector.h4
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.h4
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.cpp4
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.h4
-rw-r--r--cpp/src/IceBT/AcceptorI.cpp4
-rw-r--r--cpp/src/IceBT/AcceptorI.h4
-rw-r--r--cpp/src/IceBT/Config.h4
-rw-r--r--cpp/src/IceBT/ConnectorI.cpp4
-rw-r--r--cpp/src/IceBT/ConnectorI.h4
-rw-r--r--cpp/src/IceBT/DBus.cpp4
-rw-r--r--cpp/src/IceBT/DBus.h4
-rw-r--r--cpp/src/IceBT/EndpointI.cpp4
-rw-r--r--cpp/src/IceBT/EndpointI.h4
-rw-r--r--cpp/src/IceBT/Engine.cpp4
-rw-r--r--cpp/src/IceBT/Engine.h4
-rw-r--r--cpp/src/IceBT/EngineF.h4
-rw-r--r--cpp/src/IceBT/Instance.cpp4
-rw-r--r--cpp/src/IceBT/Instance.h4
-rw-r--r--cpp/src/IceBT/InstanceF.h4
-rw-r--r--cpp/src/IceBT/Makefile.mk4
-rw-r--r--cpp/src/IceBT/PluginI.cpp4
-rw-r--r--cpp/src/IceBT/PluginI.h4
-rw-r--r--cpp/src/IceBT/StreamSocket.cpp4
-rw-r--r--cpp/src/IceBT/StreamSocket.h4
-rw-r--r--cpp/src/IceBT/TransceiverI.cpp4
-rw-r--r--cpp/src/IceBT/TransceiverI.h4
-rw-r--r--cpp/src/IceBT/Util.cpp4
-rw-r--r--cpp/src/IceBT/Util.h4
-rw-r--r--cpp/src/IceBox/Admin.cpp4
-rw-r--r--cpp/src/IceBox/Exception.cpp4
-rw-r--r--cpp/src/IceBox/Makefile.mk4
-rw-r--r--cpp/src/IceBox/Service.cpp4
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp4
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h4
-rw-r--r--cpp/src/IceBridge/IceBridge.cpp4
-rw-r--r--cpp/src/IceBridge/Makefile.mk4
-rw-r--r--cpp/src/IceDB/IceDB.cpp4
-rw-r--r--cpp/src/IceDB/IceDB.h4
-rw-r--r--cpp/src/IceDB/Makefile.mk4
-rw-r--r--cpp/src/IceDiscovery/LocatorI.cpp4
-rw-r--r--cpp/src/IceDiscovery/LocatorI.h4
-rw-r--r--cpp/src/IceDiscovery/LookupI.cpp4
-rw-r--r--cpp/src/IceDiscovery/LookupI.h4
-rw-r--r--cpp/src/IceDiscovery/Makefile.mk4
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp4
-rw-r--r--cpp/src/IceDiscovery/PluginI.h4
-rw-r--r--cpp/src/IceGrid/Activator.cpp4
-rw-r--r--cpp/src/IceGrid/Activator.h4
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp4
-rw-r--r--cpp/src/IceGrid/AdapterCache.h4
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.cpp4
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.h4
-rw-r--r--cpp/src/IceGrid/AdminI.cpp4
-rw-r--r--cpp/src/IceGrid/AdminI.h4
-rw-r--r--cpp/src/IceGrid/AdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/AdminRouter.h4
-rw-r--r--cpp/src/IceGrid/AdminSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/AdminSessionI.h4
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp4
-rw-r--r--cpp/src/IceGrid/Allocatable.h4
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp4
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.h4
-rw-r--r--cpp/src/IceGrid/Cache.h4
-rw-r--r--cpp/src/IceGrid/Client.cpp4
-rw-r--r--cpp/src/IceGrid/Database.cpp4
-rw-r--r--cpp/src/IceGrid/Database.h4
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.h4
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.h4
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp4
-rw-r--r--cpp/src/IceGrid/DescriptorParser.h4
-rw-r--r--cpp/src/IceGrid/FileCache.cpp4
-rw-r--r--cpp/src/IceGrid/FileCache.h4
-rw-r--r--cpp/src/IceGrid/FileParserI.cpp4
-rw-r--r--cpp/src/IceGrid/FileParserI.h4
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.cpp4
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.h4
-rw-r--r--cpp/src/IceGrid/Grammar.cpp4
-rw-r--r--cpp/src/IceGrid/Grammar.y4
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp4
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.cpp4
-rw-r--r--cpp/src/IceGrid/Internal.ice4
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.h4
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp4
-rw-r--r--cpp/src/IceGrid/LocatorI.h4
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.h4
-rw-r--r--cpp/src/IceGrid/Makefile.mk4
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.h4
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp4
-rw-r--r--cpp/src/IceGrid/NodeCache.h4
-rw-r--r--cpp/src/IceGrid/NodeI.cpp4
-rw-r--r--cpp/src/IceGrid/NodeI.h4
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/NodeSessionI.h4
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.h4
-rw-r--r--cpp/src/IceGrid/ObjectCache.cpp4
-rw-r--r--cpp/src/IceGrid/ObjectCache.h4
-rw-r--r--cpp/src/IceGrid/Parser.cpp6
-rw-r--r--cpp/src/IceGrid/Parser.h4
-rw-r--r--cpp/src/IceGrid/PlatformInfo.cpp4
-rw-r--r--cpp/src/IceGrid/PlatformInfo.h4
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.cpp4
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.h4
-rw-r--r--cpp/src/IceGrid/QueryI.cpp4
-rw-r--r--cpp/src/IceGrid/QueryI.h4
-rw-r--r--cpp/src/IceGrid/ReapThread.cpp4
-rw-r--r--cpp/src/IceGrid/ReapThread.h4
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.cpp4
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.h4
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp4
-rw-r--r--cpp/src/IceGrid/RegistryI.h4
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaCache.h4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.h4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.h4
-rw-r--r--cpp/src/IceGrid/Scanner.cpp4
-rw-r--r--cpp/src/IceGrid/Scanner.l4
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.cpp4
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.h4
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp4
-rw-r--r--cpp/src/IceGrid/ServerCache.h4
-rw-r--r--cpp/src/IceGrid/ServerI.cpp4
-rw-r--r--cpp/src/IceGrid/ServerI.h4
-rw-r--r--cpp/src/IceGrid/SessionI.cpp4
-rw-r--r--cpp/src/IceGrid/SessionI.h4
-rw-r--r--cpp/src/IceGrid/SessionManager.cpp4
-rw-r--r--cpp/src/IceGrid/SessionManager.h4
-rw-r--r--cpp/src/IceGrid/SessionServantManager.cpp4
-rw-r--r--cpp/src/IceGrid/SessionServantManager.h4
-rw-r--r--cpp/src/IceGrid/Topics.cpp4
-rw-r--r--cpp/src/IceGrid/Topics.h4
-rw-r--r--cpp/src/IceGrid/TraceLevels.cpp4
-rw-r--r--cpp/src/IceGrid/TraceLevels.h4
-rw-r--r--cpp/src/IceGrid/Util.cpp4
-rw-r--r--cpp/src/IceGrid/Util.h4
-rw-r--r--cpp/src/IceGrid/WaitQueue.cpp4
-rw-r--r--cpp/src/IceGrid/WaitQueue.h4
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.cpp4
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.h4
-rw-r--r--cpp/src/IceGridLib/Makefile.mk4
-rw-r--r--cpp/src/IceGridLib/PluginFacadeI.cpp4
-rw-r--r--cpp/src/IceIAP/Connector.h4
-rw-r--r--cpp/src/IceIAP/Connector.mm4
-rw-r--r--cpp/src/IceIAP/EndpointI.h4
-rw-r--r--cpp/src/IceIAP/EndpointI.mm4
-rw-r--r--cpp/src/IceIAP/Makefile.mk4
-rw-r--r--cpp/src/IceIAP/Transceiver.h4
-rw-r--r--cpp/src/IceIAP/Transceiver.mm4
-rw-r--r--cpp/src/IceLocatorDiscovery/Makefile.mk4
-rw-r--r--cpp/src/IceLocatorDiscovery/Plugin.h4
-rw-r--r--cpp/src/IceLocatorDiscovery/PluginI.cpp4
-rw-r--r--cpp/src/IcePatch2/Calc.cpp4
-rw-r--r--cpp/src/IcePatch2/Client.cpp4
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp4
-rw-r--r--cpp/src/IcePatch2/FileServerI.h4
-rw-r--r--cpp/src/IcePatch2/Makefile.mk4
-rw-r--r--cpp/src/IcePatch2/Server.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/ClientUtil.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/Makefile.mk4
-rw-r--r--cpp/src/IcePatch2Lib/Util.cpp4
-rw-r--r--cpp/src/IcePatch2Lib/Util.h4
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp4
-rw-r--r--cpp/src/IceSSL/AcceptorI.h4
-rw-r--r--cpp/src/IceSSL/CertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/CertificateI.h4
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp4
-rw-r--r--cpp/src/IceSSL/ConnectorI.h4
-rw-r--r--cpp/src/IceSSL/EndpointI.cpp4
-rw-r--r--cpp/src/IceSSL/EndpointI.h4
-rw-r--r--cpp/src/IceSSL/Instance.cpp4
-rw-r--r--cpp/src/IceSSL/Instance.h4
-rw-r--r--cpp/src/IceSSL/InstanceF.h4
-rw-r--r--cpp/src/IceSSL/Makefile.mk4
-rw-r--r--cpp/src/IceSSL/OpenSSLCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngineF.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.h4
-rwxr-xr-xcpp/src/IceSSL/PluginI.cpp4
-rw-r--r--cpp/src/IceSSL/PluginI.h4
-rw-r--r--cpp/src/IceSSL/RFC2253.cpp4
-rw-r--r--cpp/src/IceSSL/RFC2253.h4
-rw-r--r--cpp/src/IceSSL/SChannelCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelEngine.h4
-rw-r--r--cpp/src/IceSSL/SChannelEngineF.h4
-rw-r--r--cpp/src/IceSSL/SChannelPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/SSLEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SSLEngine.h4
-rw-r--r--cpp/src/IceSSL/SSLEngineF.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportEngineF.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.h4
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.cpp4
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.h4
-rw-r--r--cpp/src/IceSSL/TrustManager.cpp4
-rw-r--r--cpp/src/IceSSL/TrustManager.h4
-rw-r--r--cpp/src/IceSSL/TrustManagerF.h4
-rw-r--r--cpp/src/IceSSL/UWPCertificateI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPEngine.cpp4
-rw-r--r--cpp/src/IceSSL/UWPEngine.h4
-rw-r--r--cpp/src/IceSSL/UWPEngineF.h4
-rw-r--r--cpp/src/IceSSL/UWPPluginI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.cpp4
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.h4
-rwxr-xr-xcpp/src/IceSSL/Util.cpp4
-rw-r--r--cpp/src/IceSSL/Util.h4
-rw-r--r--cpp/src/IceStorm/Admin.cpp4
-rw-r--r--cpp/src/IceStorm/DBTypes.ice4
-rw-r--r--cpp/src/IceStorm/Election.ice4
-rw-r--r--cpp/src/IceStorm/Grammar.cpp4
-rw-r--r--cpp/src/IceStorm/Grammar.y4
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp4
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice4
-rw-r--r--cpp/src/IceStorm/Instance.cpp4
-rw-r--r--cpp/src/IceStorm/Instance.h4
-rw-r--r--cpp/src/IceStorm/Instrumentation.ice4
-rw-r--r--cpp/src/IceStorm/InstrumentationI.cpp4
-rw-r--r--cpp/src/IceStorm/InstrumentationI.h4
-rw-r--r--cpp/src/IceStorm/LLURecord.ice4
-rw-r--r--cpp/src/IceStorm/LinkRecord.ice4
-rw-r--r--cpp/src/IceStorm/Makefile.mk4
-rw-r--r--cpp/src/IceStorm/NodeI.cpp4
-rw-r--r--cpp/src/IceStorm/NodeI.h4
-rw-r--r--cpp/src/IceStorm/Observers.cpp4
-rw-r--r--cpp/src/IceStorm/Observers.h4
-rw-r--r--cpp/src/IceStorm/Parser.cpp6
-rw-r--r--cpp/src/IceStorm/Parser.h4
-rw-r--r--cpp/src/IceStorm/Replica.h4
-rw-r--r--cpp/src/IceStorm/Scanner.cpp4
-rw-r--r--cpp/src/IceStorm/Scanner.l4
-rw-r--r--cpp/src/IceStorm/Service.cpp4
-rw-r--r--cpp/src/IceStorm/Service.h4
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp4
-rw-r--r--cpp/src/IceStorm/Subscriber.h4
-rw-r--r--cpp/src/IceStorm/SubscriberRecord.ice4
-rw-r--r--cpp/src/IceStorm/TopicI.cpp4
-rw-r--r--cpp/src/IceStorm/TopicI.h4
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp4
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h4
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp4
-rw-r--r--cpp/src/IceStorm/TraceLevels.h4
-rw-r--r--cpp/src/IceStorm/TransientTopicI.cpp4
-rw-r--r--cpp/src/IceStorm/TransientTopicI.h4
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.cpp4
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.h4
-rw-r--r--cpp/src/IceStorm/Util.cpp4
-rw-r--r--cpp/src/IceStorm/Util.h4
-rw-r--r--cpp/src/IceStormLib/Makefile.mk4
-rw-r--r--cpp/src/IceUtil/ConsoleUtil.cpp4
-rw-r--r--cpp/src/IceUtil/ConvertUTF.cpp4
-rw-r--r--cpp/src/IceUtil/ConvertUTF.h4
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp4
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp4
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp4
-rw-r--r--cpp/src/IceUtil/Makefile.mk4
-rw-r--r--cpp/src/IceUtil/MutexProtocol.cpp4
-rw-r--r--cpp/src/IceUtil/Options.cpp4
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp4
-rw-r--r--cpp/src/IceUtil/Random.cpp4
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp4
-rw-r--r--cpp/src/IceUtil/Shared.cpp4
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp4
-rw-r--r--cpp/src/IceUtil/StringUtil.cpp4
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp4
-rw-r--r--cpp/src/IceUtil/Time.cpp4
-rw-r--r--cpp/src/IceUtil/UUID.cpp4
-rw-r--r--cpp/src/IceUtil/Unicode.cpp4
-rw-r--r--cpp/src/IceUtil/Unicode.h4
-rw-r--r--cpp/src/IceUtil/UtilException.cpp4
-rw-r--r--cpp/src/IceXML/Makefile.mk4
-rw-r--r--cpp/src/IceXML/Parser.cpp4
-rw-r--r--cpp/src/IceXML/Parser.h4
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp8
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.h4
-rw-r--r--cpp/src/Slice/Checksum.cpp4
-rw-r--r--cpp/src/Slice/Checksum.h4
-rw-r--r--cpp/src/Slice/FileTracker.cpp4
-rw-r--r--cpp/src/Slice/FileTracker.h4
-rw-r--r--cpp/src/Slice/Grammar.cpp4
-rw-r--r--cpp/src/Slice/Grammar.y4
-rw-r--r--cpp/src/Slice/GrammarUtil.h4
-rw-r--r--cpp/src/Slice/JavaUtil.cpp8
-rw-r--r--cpp/src/Slice/JavaUtil.h4
-rw-r--r--cpp/src/Slice/MD5.cpp4
-rw-r--r--cpp/src/Slice/MD5.h4
-rw-r--r--cpp/src/Slice/Makefile.mk4
-rw-r--r--cpp/src/Slice/PHPUtil.cpp4
-rw-r--r--cpp/src/Slice/PHPUtil.h4
-rw-r--r--cpp/src/Slice/Parser.cpp4
-rw-r--r--cpp/src/Slice/Parser.h4
-rw-r--r--cpp/src/Slice/Preprocessor.cpp4
-rw-r--r--cpp/src/Slice/Preprocessor.h4
-rw-r--r--cpp/src/Slice/Python.cpp4
-rw-r--r--cpp/src/Slice/PythonUtil.cpp8
-rw-r--r--cpp/src/Slice/PythonUtil.h4
-rw-r--r--cpp/src/Slice/Ruby.cpp4
-rw-r--r--cpp/src/Slice/RubyUtil.cpp8
-rw-r--r--cpp/src/Slice/RubyUtil.h4
-rw-r--r--cpp/src/Slice/Scanner.cpp4
-rw-r--r--cpp/src/Slice/Scanner.l4
-rw-r--r--cpp/src/Slice/SliceUtil.cpp4
-rw-r--r--cpp/src/Slice/StringLiteralUtil.cpp4
-rw-r--r--cpp/src/Slice/Util.h4
-rw-r--r--cpp/src/icegriddb/DBTypes.ice4
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp4
-rw-r--r--cpp/src/icegriddb/Makefile.mk4
-rw-r--r--cpp/src/iceserviceinstall/Install.cpp4
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp4
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.h4
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.cpp4
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h4
-rw-r--r--cpp/src/slice2confluence/Gen.cpp4
-rw-r--r--cpp/src/slice2confluence/Gen.h4
-rw-r--r--cpp/src/slice2confluence/Main.cpp4
-rw-r--r--cpp/src/slice2cpp/Gen.cpp4
-rw-r--r--cpp/src/slice2cpp/Gen.h4
-rw-r--r--cpp/src/slice2cpp/Main.cpp4
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp4
-rw-r--r--cpp/src/slice2cs/CsUtil.h4
-rw-r--r--cpp/src/slice2cs/DotNetNames.cpp4
-rw-r--r--cpp/src/slice2cs/DotNetNames.h4
-rw-r--r--cpp/src/slice2cs/Gen.cpp8
-rw-r--r--cpp/src/slice2cs/Gen.h4
-rw-r--r--cpp/src/slice2cs/Main.cpp4
-rw-r--r--cpp/src/slice2html/Gen.cpp4
-rw-r--r--cpp/src/slice2html/Gen.h4
-rw-r--r--cpp/src/slice2html/Main.cpp4
-rw-r--r--cpp/src/slice2java/Gen.cpp4
-rw-r--r--cpp/src/slice2java/Gen.h4
-rw-r--r--cpp/src/slice2java/GenCompat.cpp4
-rw-r--r--cpp/src/slice2java/GenCompat.h4
-rw-r--r--cpp/src/slice2java/Main.cpp4
-rw-r--r--cpp/src/slice2js/Gen.cpp8
-rw-r--r--cpp/src/slice2js/Gen.h4
-rw-r--r--cpp/src/slice2js/JsUtil.cpp4
-rw-r--r--cpp/src/slice2js/JsUtil.h4
-rw-r--r--cpp/src/slice2js/Main.cpp4
-rw-r--r--cpp/src/slice2matlab/Main.cpp6
-rw-r--r--cpp/src/slice2objc/Gen.cpp8
-rw-r--r--cpp/src/slice2objc/Gen.h4
-rw-r--r--cpp/src/slice2objc/Main.cpp4
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp4
-rw-r--r--cpp/src/slice2objc/ObjCUtil.h4
-rw-r--r--cpp/src/slice2php/Main.cpp8
-rw-r--r--cpp/src/slice2py/Main.cpp4
-rw-r--r--cpp/src/slice2rb/Main.cpp4
599 files changed, 610 insertions, 1824 deletions
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index ec44083d713..20a8ae2e8cc 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/Blobject.h>
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h
index d81d016ad55..c6d049704a3 100644
--- a/cpp/src/Glacier2/Blobject.h
+++ b/cpp/src/Glacier2/Blobject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef BLOBJECT_H
#define BLOBJECT_H
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp
index 2ab1871b293..cb074674a99 100644
--- a/cpp/src/Glacier2/ClientBlobject.cpp
+++ b/cpp/src/Glacier2/ClientBlobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ClientBlobject.h>
#include <Glacier2/FilterManager.h>
diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h
index 5d1765b6e79..abc6e87fd66 100644
--- a/cpp/src/Glacier2/ClientBlobject.h
+++ b/cpp/src/Glacier2/ClientBlobject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CLIENT_BLOBJECT_H
#define CLIENT_BLOBJECT_H
diff --git a/cpp/src/Glacier2/FilterI.cpp b/cpp/src/Glacier2/FilterI.cpp
index 9153ff6497f..987efab6484 100644
--- a/cpp/src/Glacier2/FilterI.cpp
+++ b/cpp/src/Glacier2/FilterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Properties.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h
index 098d75c53a8..e9c79e952f6 100644
--- a/cpp/src/Glacier2/FilterI.h
+++ b/cpp/src/Glacier2/FilterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILTER_I_H
#define FILTER_I_H
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp
index 148583ebde5..67dfca80d6e 100644
--- a/cpp/src/Glacier2/FilterManager.cpp
+++ b/cpp/src/Glacier2/FilterManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/Logger.h>
diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h
index 8fc7119b631..3537ee2c93a 100644
--- a/cpp/src/Glacier2/FilterManager.h
+++ b/cpp/src/Glacier2/FilterManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILTER_MANAGER_H
#define FILTER_MANAGER_H
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 5f38d12a461..f608a86c3f7 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/Options.h>
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index 0392c588d02..3d6d7cf4404 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionRouterI.h>
#include <Glacier2/Instance.h>
diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h
index 7ec1f80d134..514272222ab 100644
--- a/cpp/src/Glacier2/Instance.h
+++ b/cpp/src/Glacier2/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_INSTANCE_H
#define GLACIER2_INSTANCE_H
diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice
index e86f35cedf5..e38da747efa 100644
--- a/cpp/src/Glacier2/Instrumentation.ice
+++ b/cpp/src/Glacier2/Instrumentation.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/Glacier2/InstrumentationI.cpp b/cpp/src/Glacier2/InstrumentationI.cpp
index cd5efce3585..d02f8e1f2fc 100644
--- a/cpp/src/Glacier2/InstrumentationI.cpp
+++ b/cpp/src/Glacier2/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/InstrumentationI.h>
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Glacier2/InstrumentationI.h b/cpp/src/Glacier2/InstrumentationI.h
index 6b846d5e90e..d75f346a485 100644
--- a/cpp/src/Glacier2/InstrumentationI.h
+++ b/cpp/src/Glacier2/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTRUMENTATION_I_H
#define INSTRUMENTATION_I_H
diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk
index 74fb91a3a44..bc073a35671 100644
--- a/cpp/src/Glacier2/Makefile.mk
+++ b/cpp/src/Glacier2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := glacier2router
$(project)_sliceflags := --include-dir Glacier2
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index a08e3ee02ed..cf80795a78e 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ProxyVerifier.h>
#include <Ice/ConsoleUtil.h>
diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h
index b5ba17a1222..b20d835ee2d 100644
--- a/cpp/src/Glacier2/ProxyVerifier.h
+++ b/cpp/src/Glacier2/ProxyVerifier.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_VERIFIER_H
#define ICE_PROXY_VERIFIER_H
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 4e96253a3c5..4fef48c3487 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/RequestQueue.h>
#include <Glacier2/Instance.h>
diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h
index fb06e77c155..6ef8055cf61 100644
--- a/cpp/src/Glacier2/RequestQueue.h
+++ b/cpp/src/Glacier2/RequestQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef REQUEST_H
#define REQUEST_H
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index f32c1d06db9..a26012ccecd 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 03d42898aac..98fe25a2d3c 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_ROUTER_I_H
#define GLACIER2_ROUTER_I_H
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index a5958dfffca..a38b5b05f78 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/RoutingTable.h>
#include <Glacier2/Instrumentation.h>
diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h
index ff50e384968..97b858bdf0f 100644
--- a/cpp/src/Glacier2/RoutingTable.h
+++ b/cpp/src/Glacier2/RoutingTable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTING_TABLE_H
#define ICE_ROUTING_TABLE_H
diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index c1a5a1ad79c..1d666af5a37 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/ServerBlobject.h>
diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h
index 5e81784e9d0..6fee81867d5 100644
--- a/cpp/src/Glacier2/ServerBlobject.h
+++ b/cpp/src/Glacier2/ServerBlobject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SERVER_BLOBJECT_H
#define SERVER_BLOBJECT_H
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 709c6428dda..3cbb1a92856 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionRouterI.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 4360837667f..5e67e75ac49 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GLACIER2_SESSION_ROUTER_I_H
#define GLACIER2_SESSION_ROUTER_I_H
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
index 7a13f6e0b28..70c8e977f5f 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
index 8f56b2d33ed..d6dd6e93a37 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries += Glacier2CryptPermissionsVerifier
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index ed30e5db11e..ef330e41e88 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/Application.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk
index f2e43b6eb00..9e957731227 100644
--- a/cpp/src/Glacier2Lib/Makefile.mk
+++ b/cpp/src/Glacier2Lib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := Glacier2
diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
index a6690b42622..382f25240fc 100644
--- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
+++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
#include <Glacier2/NullPermissionsVerifier.h>
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 637cd84a5e1..52079819004 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Glacier2/SessionHelper.h>
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index af83fc34e03..3bfa3df63af 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ACM.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index a2bfb2e7e98..107803a6f89 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACM_H
#define ICE_ACM_H
diff --git a/cpp/src/Ice/ACMF.h b/cpp/src/Ice/ACMF.h
index db5b0ca11fb..afaa1b78fe0 100644
--- a/cpp/src/Ice/ACMF.h
+++ b/cpp/src/Ice/ACMF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACM_F_H
#define ICE_ACM_F_H
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index f75b59f9e93..47281927c97 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Acceptor.h>
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index 6eea03359c2..623d26a2439 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACCEPTOR_H
#define ICE_ACCEPTOR_H
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index eef36343c05..4e6b97bf414 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ACCEPTOR_F_H
#define ICE_ACCEPTOR_F_H
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 21e884dda9a..fffd70d9902 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Application.h>
#include <Ice/LoggerI.h>
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index e5eaf87b67c..ee1d60af61b 100644
--- a/cpp/src/Ice/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <cstring>
diff --git a/cpp/src/Ice/ArgVector.h b/cpp/src/Ice/ArgVector.h
index 8dcdc024981..095856cb10a 100644
--- a/cpp/src/Ice/ArgVector.h
+++ b/cpp/src/Ice/ArgVector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ARGVECTOR_H
#define ICE_ARGVECTOR_H
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 34cf22b04c5..9e898337291 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index 59f5f0234c3..803d5b15b85 100644
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Base64.h>
#include <iterator>
diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
index e63d6ca8f43..ca898c559b0 100644
--- a/cpp/src/Ice/Base64.h
+++ b/cpp/src/Ice/Base64.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BASE_64_H
#define ICE_BASE_64_H
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 6618d863cbd..32ba60cc0f9 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/BatchRequestQueue.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index f87d0874c26..5ef6921d461 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_H
#define ICE_BATCH_REQUEST_QUEUE_H
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp
index 00f557f3a68..8b4c6f9062a 100644
--- a/cpp/src/Ice/Buffer.cpp
+++ b/cpp/src/Ice/Buffer.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Buffer.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index f00257f24f3..58f52475a1a 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/CollocatedRequestHandler.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index f0ed8b29f30..d0ac16d5a7a 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
#define ICE_COLLOCATED_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 0a8a6a03815..36198c82d75 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/CommunicatorI.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 776fde355d6..f28b49a2299 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_COMMUNICATOR_I_H
#define ICE_COMMUNICATOR_I_H
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp
index 02d4003bbdb..9f33e894a01 100644
--- a/cpp/src/Ice/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Cond.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 0be8fe54899..c50c47401db 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectRequestHandler.h>
#include <Ice/ConnectionRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index dc0fbf45f23..7b3918850b6 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_H
#define ICE_CONNECT_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index 8c82187b170..aed35baf27e 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
#define ICE_CONNECT_REQUEST_HANDLER_F_H
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 40d76f896c9..9732cbe81b2 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectionFactory.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 7ae02361601..f11004d34fa 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_H
#define ICE_CONNECTION_FACTORY_H
diff --git a/cpp/src/Ice/ConnectionFactoryF.h b/cpp/src/Ice/ConnectionFactoryF.h
index ff0d4734089..40829f37624 100644
--- a/cpp/src/Ice/ConnectionFactoryF.h
+++ b/cpp/src/Ice/ConnectionFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_F_H
#define ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index dc6691649e5..1666717289f 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 956c72d9355..bc0241ec8c1 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_I_H
#define ICE_CONNECTION_I_H
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index 72ae5a27581..cb5055fa34c 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ConnectionRequestHandler.h>
#include <Ice/Proxy.h>
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index ed599b35547..097aee73d7a 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTION_REQUEST_HANDLER_H
#define ICE_CONNECTION_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index be758b132eb..0d9739d035c 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connector.h>
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index c4b3b6e3e25..1daa7a11fd4 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTOR_H
#define ICE_CONNECTOR_H
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 29f7957885d..22a5a825bdf 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_CONNECTOR_F_H
#define ICE_CONNECTOR_F_H
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index e29393a059a..15ccefd4605 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CountDownLatch.h>
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index f7da03b5bc5..e232f6bd54e 100644
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ImplicitContextI.h>
#include <Ice/Service.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 030ee6e8c6d..1acdc3d112a 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DefaultsAndOverrides.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 7d95ca7ee11..fbff736a74f 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
#define ICE_DEFAULTS_AND_OVERRIDES_H
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 1336077b536..7f1d9873a2d 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
#define ICE_DEFAULTS_AND_OVERRIDES_F_H
diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp
index fa41f4796c4..10457e990e9 100644
--- a/cpp/src/Ice/DispatchInterceptor.cpp
+++ b/cpp/src/Ice/DispatchInterceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DispatchInterceptor.h>
#include <Ice/IncomingRequest.h>
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 75dea12610b..3fac7e6ecfe 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/DynamicLibrary.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index d040c737b8a..4d4f39405a2 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointFactory.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h
index 8333b820ea5..4bcbf5b3d9c 100644
--- a/cpp/src/Ice/EndpointFactory.h
+++ b/cpp/src/Ice/EndpointFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_H
#define ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/src/Ice/EndpointFactoryF.h b/cpp/src/Ice/EndpointFactoryF.h
index 10fa4cc5311..22ae52dd4a0 100644
--- a/cpp/src/Ice/EndpointFactoryF.h
+++ b/cpp/src/Ice/EndpointFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_F_H
#define ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index ea653bb55f5..0c9ed3c6c26 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointFactoryManager.h>
#include <Ice/Endpoint.h>
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index eb2fc71d983..b2ef39b3637 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
#define ICE_ENDPOINT_FACTORY_MANAGER_H
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 32e21e25a67..f24fb5ccfa4 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
#define ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 367795c6477..1c46219cd44 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EndpointI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index b46abe30208..0929d3e8fb9 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_I_H
#define ICE_ENDPOINT_I_H
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index d8dc7e20fd7..7944b286d22 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ENDPOINT_I_F_H
#define ICE_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 3cb1d2138a7..287cdcdb5e1 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/EventHandler.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 99f8b4cc1b6..190a3fc0afc 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EVENT_HANDLER_H
#define ICE_EVENT_HANDLER_H
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index 6b95c6ed842..e762d31a988 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_EVENT_HANDLER_F_H
#define ICE_EVENT_HANDLER_F_H
diff --git a/cpp/src/Ice/EventLoggerMsg.mc b/cpp/src/Ice/EventLoggerMsg.mc
index 7f512f34025..f72b5cce878 100755
--- a/cpp/src/Ice/EventLoggerMsg.mc
+++ b/cpp/src/Ice/EventLoggerMsg.mc
@@ -1,8 +1,6 @@
-; // **********************************************************************
; //
-; // Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+; // Copyright (c) ZeroC, Inc. All rights reserved.
; //
-; // **********************************************************************
MessageId=0x0
SymbolicName=EVENT_LOGGER_MSG
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 459cdcfc8fa..64c1f9c3703 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Exception.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 3fea598436a..7afe0bd04fa 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/FactoryTable.h>
#include <Ice/ValueFactory.h>
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 7230b1711b0..55a7134d249 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/FactoryTableInit.h>
#include <Ice/UserExceptionFactory.h>
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 988185c446d..79b5bffb604 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/GCObject.h>
diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h
index 15faa844157..e565bb5df28 100644
--- a/cpp/src/Ice/HashUtil.h
+++ b/cpp/src/Ice/HashUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HASH_UTIL_H
#define ICE_HASH_UTIL_H
diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
index d1578c59d03..1553d7e7d26 100644
--- a/cpp/src/Ice/HttpParser.cpp
+++ b/cpp/src/Ice/HttpParser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
#include <Ice/HttpParser.h>
diff --git a/cpp/src/Ice/HttpParser.h b/cpp/src/Ice/HttpParser.h
index af992fe7e0e..b2528c0cbed 100644
--- a/cpp/src/Ice/HttpParser.h
+++ b/cpp/src/Ice/HttpParser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_HTTP_PARSER_H
#define ICE_HTTP_PARSER_H
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index 54aebd7641e..78ef994fbea 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IPEndpointI.h>
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 1c676668a54..591c19c1d85 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_H
#define ICE_IP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index 4feace4fae4..1125285fb6a 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_F_H
#define ICE_IP_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp
index 30665bba5a5..3babf46cfc7 100644
--- a/cpp/src/Ice/IconvStringConverter.cpp
+++ b/cpp/src/Ice/IconvStringConverter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IconvStringConverter.h>
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 74f5c9ed209..c9d60b2ae4e 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ImplicitContextI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index ec81e4f944e..7b412a7562a 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IMPLICIT_CONTEXT_I_H
#define ICE_IMPLICIT_CONTEXT_I_H
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index e8ee2feb844..1fce4e5f107 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Incoming.h>
#include <Ice/IncomingAsync.h>
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 543a0419565..9841e9e37a0 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/IncomingAsync.h>
#include <Ice/ServantLocator.h>
diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h
index a3e40ee4965..1d9aea452c4 100644
--- a/cpp/src/Ice/IncomingRequest.h
+++ b/cpp/src/Ice/IncomingRequest.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INCOMING_REQUEST_H
#define ICE_INCOMING_REQUEST_H
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index b81cc91bdab..70f48b781ac 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <Ice/CommunicatorI.h>
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index 943b51f255d..79ba83ed174 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/InputStream.h>
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index d8dd997e45c..4c3fa1f1e5c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Instance.h>
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 1570969aaa6..70e9c249e42 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTANCE_H
#define ICE_INSTANCE_H
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index 449356d43e3..e4ca6fad53d 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 2ead12457ab..da155ae8ca9 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_INSTRUMENTATION_I_H
#define ICE_INSTRUMENTATION_I_H
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index 254bd23c08a..ff6b38710d0 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LocalObject.h>
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 7b686ed898b..b1a5159365d 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/LocatorInfo.h>
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 974faaebc95..b156c46cb64 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCATOR_INFO_H
#define ICE_LOCATOR_INFO_H
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index 170c3b47368..fd689ce26b9 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOCATOR_INFO_F_H
#define ICE_LOCATOR_INFO_F_H
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index c9d4169be3c..24bf8c5b687 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LoggerAdminI.h>
#include <Ice/Initialize.h>
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index b1a97416271..f697fb2dfdc 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_ADMIN_I_H
#define ICE_LOGGER_ADMIN_I_H
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index bed87c9beb9..44842207a3d 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Time.h>
#include <Ice/LoggerI.h>
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index f71bcef9aa5..0a48c298ac4 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_LOGGER_I_H
#define ICE_LOGGER_I_H
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 67798cc290c..030ca975b56 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/LoggerUtil.h>
#include <Ice/Logger.h>
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
index 84e2ee5cbfd..5ca2b03e9f2 100644
--- a/cpp/src/Ice/Makefile.mk
+++ b/cpp/src/Ice/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = Ice
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index 5dd55417f51..3142164b805 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/MetricsAdminI.h>
diff --git a/cpp/src/Ice/MetricsObserverI.cpp b/cpp/src/Ice/MetricsObserverI.cpp
index 81accf60ec1..4bd5f665500 100644
--- a/cpp/src/Ice/MetricsObserverI.cpp
+++ b/cpp/src/Ice/MetricsObserverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/MetricsObserverI.h>
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 0b7739a1900..9a865c664c7 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// The following is required on HP-UX in order to bring in
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 470c35816e0..01b10936317 100755
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_H
#define ICE_NETWORK_H
diff --git a/cpp/src/Ice/NetworkF.h b/cpp/src/Ice/NetworkF.h
index 8bde8bc0526..7ca133126be 100644
--- a/cpp/src/Ice/NetworkF.h
+++ b/cpp/src/Ice/NetworkF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_F_H
#define ICE_NETWORK_F_H
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
index 64514c70905..a4f771e679f 100644
--- a/cpp/src/Ice/NetworkProxy.cpp
+++ b/cpp/src/Ice/NetworkProxy.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/NetworkProxy.h>
#include <Ice/HttpParser.h>
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index fe3f7a896e4..22714afbccd 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_PROXY_H
#define ICE_NETWORK_PROXY_H
diff --git a/cpp/src/Ice/NetworkProxyF.h b/cpp/src/Ice/NetworkProxyF.h
index dc30f562150..eaf98115d0b 100644
--- a/cpp/src/Ice/NetworkProxyF.h
+++ b/cpp/src/Ice/NetworkProxyF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_NETWORK_PROXY_F_H
#define ICE_NETWORK_PROXY_F_H
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 74e228aba5b..d5509a24b5f 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Object.h>
#include <Ice/Incoming.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 82b2d31cd80..ac8bf7774cb 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ObjectAdapterFactory.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index b80d71ece70..b8e971f1e52 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
#define ICE_OBJECT_ADAPTER_FACTORY_H
diff --git a/cpp/src/Ice/ObjectAdapterFactoryF.h b/cpp/src/Ice/ObjectAdapterFactoryF.h
index 58d1c0702d3..38c7bc5b99e 100644
--- a/cpp/src/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/src/Ice/ObjectAdapterFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
#define ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index dbe6b87eeb4..830f9c071ca 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/ObjectAdapterI.h>
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 209faa28e78..9c024a90b64 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_I_H
#define ICE_OBJECT_ADAPTER_I_H
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index a205267e1a5..3fe7e353a9f 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ObserverHelper.h>
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index 40b2a0061b4..3252b6a4a45 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OpaqueEndpointI.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index 6c65eaafa09..3a19a369bb5 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UNKNOWN_ENDPOINT_I_H
#define ICE_UNKNOWN_ENDPOINT_I_H
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 9ca32e6029a..0672fb1b833 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OutgoingAsync.h>
#include <Ice/ConnectionI.h>
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 53c4c32a175..e316ec634f4 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/OutputStream.h>
#include <Ice/DefaultsAndOverrides.h>
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index bc8aae6e9b8..63da0b2c3e9 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/PluginManagerI.h>
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index d3b9089e51f..d853d5bc53a 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PLUGIN_MANAGER_I_H
#define ICE_PLUGIN_MANAGER_I_H
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index a198fe7832f..72a224185c8 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/PropertiesAdminI.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 82a1e2da26c..d04da8f96e0 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_I_H
#define ICE_PROPERTIES_ADMIN_I_H
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index ccb73e7a9a0..a9fccc84be2 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/PropertiesI.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index fcdf42cbbdc..b78788e7e8c 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROPERTIES_I_H
#define ICE_PROPERTIES_I_H
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 213ee6c2553..fc3b319e828 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 0f5df4cb150..a820f58a7ad 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 62d0d2706f7..34005afdad7 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Protocol.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index bf2e7b67b7f..c9dbac3cd00 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ProtocolInstance.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index c6f2893219c..d180768fcc1 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_H
#define ICE_PROTOCOL_INSTANCE_H
diff --git a/cpp/src/Ice/ProtocolInstanceF.h b/cpp/src/Ice/ProtocolInstanceF.h
index 8c5fe3bd8ca..b63532c19d7 100644
--- a/cpp/src/Ice/ProtocolInstanceF.h
+++ b/cpp/src/Ice/ProtocolInstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_F_H
#define ICE_PROTOCOL_INSTANCE_F_H
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index a9030670517..ccfbd9cff29 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ProtocolPluginFacade.h>
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/ProtocolPluginFacade.h b/cpp/src/Ice/ProtocolPluginFacade.h
index 8b8375a2537..45fe294fd06 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.h
+++ b/cpp/src/Ice/ProtocolPluginFacade.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
#define ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/src/Ice/ProtocolPluginFacadeF.h b/cpp/src/Ice/ProtocolPluginFacadeF.h
index ba1c9a4e6df..b050cf5981a 100644
--- a/cpp/src/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/src/Ice/ProtocolPluginFacadeF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 85871b699b9..f2b6e188ceb 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Proxy.h>
#include <Ice/ProxyFactory.h>
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index d3e0f115314..e2ba9fdb923 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Thread.h>
#include <IceUtil/Time.h>
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 8169b09e9d1..96b0c30bd4c 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PROXY_FACTORY_H
#define ICE_PROXY_FACTORY_H
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 3c6f90537a2..a60427939b6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Reference.h>
#include <Ice/ReferenceFactory.h>
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index bf7ca251603..adaf4bf3f15 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_H
#define ICE_REFERENCE_H
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index d5efd50b77d..fcf016ac64a 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/ReferenceFactory.h>
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index 6efa856dea2..b32874eb6c4 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_H
#define ICE_REFERENCE_FACTORY_H
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index a1879a4abf1..1fe76234587 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_F_H
#define ICE_REFERENCE_FACTORY_F_H
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index c7039137062..9c78db20343 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RegisterPluginsInit.h>
#include <Ice/CommunicatorF.h>
diff --git a/cpp/src/Ice/RegisterPluginsInit.h b/cpp/src/Ice/RegisterPluginsInit.h
index 9dad32d4bec..c78edeb8f19 100644
--- a/cpp/src/Ice/RegisterPluginsInit.h
+++ b/cpp/src/Ice/RegisterPluginsInit.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_INIT_H
#define ICE_REGISTER_PLUGINS_INIT_H
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
index 224370ce2a4..8eeac4cb717 100644
--- a/cpp/src/Ice/ReplyStatus.h
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REPLY_STATUS_H
#define ICE_REPLY_STATUS_H
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index 6de365336d4..6d642d1df03 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RequestHandler.h>
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 3aafaa56827..d446f0cfe17 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_H
#define ICE_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 4643212694e..f50674d3afd 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RequestHandlerFactory.h>
#include <Ice/CollocatedRequestHandler.h>
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index 5e71d791109..501666e0682 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_FACTORY_H
#define ICE_REQUEST_HANDLER_FACTORY_H
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index 77054e9ab83..252f57aee39 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ResponseHandler.h>
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index 5cf8e2b1b66..548cc72ddc2 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_H
#define ICE_RESPONSE_HANDLER_H
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index 429d066b32c..8f9694416fd 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RetryQueue.h>
#include <Ice/OutgoingAsync.h>
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index eebf96854ec..5583f726148 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RETRY_QUEUE_H
#define ICE_RETRY_QUEUE_H
diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h
index 9fbee7c7d98..6639f138a9f 100644
--- a/cpp/src/Ice/RetryQueueF.h
+++ b/cpp/src/Ice/RetryQueueF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_RETRY_QUEUE_F_H
#define ICE_RETRY_QUEUE_F_H
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index d63fdacbfa0..7828e69510d 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/RouterInfo.h>
#include <Ice/Router.h>
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 3c47bbeae6a..d4d41d7df08 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTER_INFO_H
#define ICE_ROUTER_INFO_H
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 2f90339650d..971a0fa0ff6 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_ROUTER_INFO_F_H
#define ICE_ROUTER_INFO_F_H
diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 1db71b10ec1..e94c2ce2612 100644
--- a/cpp/src/Ice/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SHA1.h>
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index d210dd9891c..a2982ef4343 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Selector.h>
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index f98f49ccbb9..d5209d28492 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SELECTOR_H
#define ICE_SELECTOR_H
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 2ef28025948..6f985a4dfd8 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ServantManager.h>
#include <Ice/ServantLocator.h>
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index cc6518a2ebb..e19d334d2b4 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_H
#define ICE_SERVANT_MANAGER_H
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index be5003ed818..b0d05c2aeb5 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h
index 2d2d46fb890..caa9f20a2d2 100644
--- a/cpp/src/Ice/SharedContext.h
+++ b/cpp/src/Ice/SharedContext.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SHARED_CONTEXT_H
#define ICE_SHARED_CONTEXT_H
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index 3ac1532b3eb..3bd6cf6a6ff 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SliceChecksums.h>
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 0ea0ae95bde..43b5338a1a6 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/SlicedData.h>
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp
index c6459cde7bf..f335736f8ca 100755
--- a/cpp/src/Ice/StreamSocket.cpp
+++ b/cpp/src/Ice/StreamSocket.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/StreamSocket.h>
#include <Ice/NetworkProxy.h>
diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h
index 922f72216f9..3e94a3f8ac9 100644
--- a/cpp/src/Ice/StreamSocket.h
+++ b/cpp/src/Ice/StreamSocket.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_SOCKET_H
#define ICE_STREAM_SOCKET_H
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
index 5ebaa1d03a7..98257e60e8a 100644
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ b/cpp/src/Ice/StringConverterPlugin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Config.h>
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 6be689ce874..81b987876a5 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STRING_UTIL_H
#define ICE_STRING_UTIL_H
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index c105947749f..4850bfac37f 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef _WIN32
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index 221c75a1614..1495ae6a9ab 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SYS_LOGGER_I_H
#define ICE_SYS_LOGGER_I_H
diff --git a/cpp/src/Ice/SystemdJournalI.cpp b/cpp/src/Ice/SystemdJournalI.cpp
index 06ac35f06b2..cef24bee188 100644
--- a/cpp/src/Ice/SystemdJournalI.cpp
+++ b/cpp/src/Ice/SystemdJournalI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef ICE_USE_SYSTEMD
diff --git a/cpp/src/Ice/SystemdJournalI.h b/cpp/src/Ice/SystemdJournalI.h
index ae5aedd140a..cd0b1716e8f 100644
--- a/cpp/src/Ice/SystemdJournalI.h
+++ b/cpp/src/Ice/SystemdJournalI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SYSTEMD_JOURNAL_I_H
#define ICE_SYSTEMD_JOURNAL_I_H
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 2190cc05bf1..6086199dff7 100755
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpAcceptor.h>
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index c4ec822173f..819c71e8ea9 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_ACCEPTOR_H
#define ICE_TCP_ACCEPTOR_H
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 0f51c2ae977..d4b8365f9ec 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpConnector.h>
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index b86542494d6..e7726f979b9 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_CONNECTOR_H
#define ICE_TCP_CONNECTOR_H
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index c64b9069447..da22a57c165 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpEndpointI.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index e8d761a6529..9a08df6633d 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_ENDPOINT_I_H
#define ICE_TCP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index fe37b1637c3..b7cfabcdddc 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TcpTransceiver.h>
#include <Ice/Connection.h>
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index e5d2a03133d..adafd8783cd 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TCP_TRANSCEIVER_H
#define ICE_TCP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 3f22010481c..da379edb972 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef __sun
//
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index ae6bd81b9ab..b836137170a 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ThreadPool.h>
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 76e3218501e..f9641296a14 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_THREAD_POOL_H
#define ICE_THREAD_POOL_H
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 3e62448ebe6..e573b905a9d 100644
--- a/cpp/src/Ice/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Timer.h>
#include <IceUtil/Exception.h>
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index db69e96ca74..f4cd2dca303 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/TraceLevels.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index 9ac192f29ac..d6aac9fbb94 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_LEVELS_H
#define ICE_TRACE_LEVELS_H
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index 565cf3baa0d..12bd188db51 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_LEVELS_F_H
#define ICE_TRACE_LEVELS_F_H
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index 4f394282b85..e612e2dc3d4 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Mutex.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index c0f25d3ca17..c32ee253ec2 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRACE_UTIL_H
#define ICE_TRACE_UTIL_H
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index 10f45b2e82a..83de3162a82 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Transceiver.h>
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index ea6171977bc..4bf92dd7d61 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRANSCEIVER_H
#define ICE_TRANSCEIVER_H
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index d3e728fa6d2..d40a5926a83 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_TRANSCEIVER_F_H
#define ICE_TRANSCEIVER_F_H
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 43516704b3c..f6ef9857cc2 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpConnector.h>
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index 92d49dcba31..56bd2f6cb6d 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_CONNECTOR_H
#define ICE_UDP_CONNECTOR_H
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 34a33df39a6..2800890ee77 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpEndpointI.h>
#include <Ice/Network.h>
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index bed014f97ee..63414933475 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_ENDPOINT_I_H
#define ICE_UDP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 3d2b13a4088..5d6b64cc058 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UdpTransceiver.h>
#include <Ice/UdpEndpointI.h>
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index c681cef44f2..fc4572bf45b 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UDP_TRANSCEIVER_H
#define ICE_UDP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index 855fb60beed..28c9be9e794 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Value.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
index 6355e7a8edc..94e3036f8c5 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.cpp
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ValueFactoryManagerI.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h
index ce79ce945cb..df8e5f545aa 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.h
+++ b/cpp/src/Ice/ValueFactoryManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VALUE_FACTORY_MANAGER_I_H
#define ICE_VALUE_FACTORY_MANAGER_I_H
diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h
index 0f64e441a02..9b8f4a48929 100644
--- a/cpp/src/Ice/VirtualShared.h
+++ b/cpp/src/Ice/VirtualShared.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_VIRTUAL_SHARED_H
#define ICE_VIRTUAL_SHARED_H
diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp
index 9a4064edeae..474aaf2f438 100644
--- a/cpp/src/Ice/WSAcceptor.cpp
+++ b/cpp/src/Ice/WSAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSAcceptor.h>
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h
index 56e9f1978fb..7faca7dcf56 100644
--- a/cpp/src/Ice/WSAcceptor.h
+++ b/cpp/src/Ice/WSAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_ACCEPTOR_I_H
#define ICE_WS_ACCEPTOR_I_H
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index 61bbad67242..f1935833a8c 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSConnector.h>
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index fcfe3b15976..c4f30047a45 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WSCONNECTOR_I_H
#define ICE_WSCONNECTOR_I_H
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 0bb0f32d1a5..ac6742bae4f 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSEndpoint.h>
#include <Ice/WSAcceptor.h>
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index e76fc3da814..64f312f0686 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_ENDPOINT_I_H
#define ICE_WS_ENDPOINT_I_H
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index 9d3fa390c50..07ef68538f6 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/WSTransceiver.h>
#include <Ice/Endpoint.h>
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index 1f3ff4d652b..744d3649ccc 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_WS_TRANSCEIVER_I_H
#define ICE_WS_TRANSCEIVER_I_H
diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm
index b8841593dac..5009f28c0f0 100644
--- a/cpp/src/Ice/ios/Notifications.mm
+++ b/cpp/src/Ice/ios/Notifications.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Ice/Config.h>
diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp
index 1f382bfdc33..29b8ea47b7b 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.cpp
+++ b/cpp/src/Ice/ios/StreamAcceptor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h
index 6a6409d41f8..ca706cf5ea6 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.h
+++ b/cpp/src/Ice/ios/StreamAcceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_ACCEPTOR_H
#define ICE_STREAM_ACCEPTOR_H
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
index da75a9e8276..c4764d7c2f7 100644
--- a/cpp/src/Ice/ios/StreamConnector.cpp
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
index ec373351c04..ad79fd415cb 100644
--- a/cpp/src/Ice/ios/StreamConnector.h
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_CONNECTOR_H
#define ICE_STREAM_CONNECTOR_H
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
index 2f5b22acd4b..f70f47d5c3b 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.cpp
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamEndpointI.h"
#include "StreamAcceptor.h"
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
index 4a5e82297fd..3ae922c56e4 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.h
+++ b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_ENDPOINT_I_H
#define ICE_STREAM_ENDPOINT_I_H
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
index a4c047e5aab..6a0815625b5 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.cpp
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "StreamTransceiver.h"
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamTransceiver.h b/cpp/src/Ice/ios/StreamTransceiver.h
index 38cfd9de02b..ed210c3c6e8 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.h
+++ b/cpp/src/Ice/ios/StreamTransceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STREAM_TRANSCEIVER_H
#define ICE_STREAM_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/AcceptorI.cpp b/cpp/src/IceBT/AcceptorI.cpp
index cab9a303fd0..d225e2d6e47 100644
--- a/cpp/src/IceBT/AcceptorI.cpp
+++ b/cpp/src/IceBT/AcceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/AcceptorI.h>
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/AcceptorI.h b/cpp/src/IceBT/AcceptorI.h
index 7803b2e9287..fbf8ba51496 100644
--- a/cpp/src/IceBT/AcceptorI.h
+++ b/cpp/src/IceBT/AcceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ACCEPTOR_I_H
#define ICE_BT_ACCEPTOR_I_H
diff --git a/cpp/src/IceBT/Config.h b/cpp/src/IceBT/Config.h
index 445cb0da9e1..e5130ce2169 100644
--- a/cpp/src/IceBT/Config.h
+++ b/cpp/src/IceBT/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_CONFIG_H
#define ICE_BT_CONFIG_H
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
index 48c111a3e18..b9b29cc91d9 100644
--- a/cpp/src/IceBT/ConnectorI.cpp
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/ConnectorI.h>
#include <IceBT/Instance.h>
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
index 87d8cc9929f..e0ef01548e0 100644
--- a/cpp/src/IceBT/ConnectorI.h
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_CONNECTOR_I_H
#define ICE_BT_CONNECTOR_I_H
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 8648db092fd..114a86df31c 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/DBus.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h
index 6c89e3a8f2d..3c64b7706fd 100644
--- a/cpp/src/IceBT/DBus.h
+++ b/cpp/src/IceBT/DBus.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_DBUS_H
#define ICE_BT_DBUS_H
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp
index 068bcaca30f..e74ffc0d548 100644
--- a/cpp/src/IceBT/EndpointI.cpp
+++ b/cpp/src/IceBT/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/EndpointI.h>
#include <IceBT/AcceptorI.h>
diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h
index 9d9e1c655a2..a680b0afcfa 100644
--- a/cpp/src/IceBT/EndpointI.h
+++ b/cpp/src/IceBT/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENDPOINT_I_H
#define ICE_BT_ENDPOINT_I_H
diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
index 4eda781a3a6..12005078103 100644
--- a/cpp/src/IceBT/Engine.cpp
+++ b/cpp/src/IceBT/Engine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Engine.h>
#include <IceBT/DBus.h>
diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h
index 7dfec79ad15..2d0287ac53d 100644
--- a/cpp/src/IceBT/Engine.h
+++ b/cpp/src/IceBT/Engine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENGINE_H
#define ICE_BT_ENGINE_H
diff --git a/cpp/src/IceBT/EngineF.h b/cpp/src/IceBT/EngineF.h
index 80f5b6c0757..75054c1cd9e 100644
--- a/cpp/src/IceBT/EngineF.h
+++ b/cpp/src/IceBT/EngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_ENGINE_F_H
#define ICE_BT_ENGINE_F_H
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp
index 6487f1193c6..e77410f707e 100644
--- a/cpp/src/IceBT/Instance.cpp
+++ b/cpp/src/IceBT/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Instance.h>
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/Instance.h b/cpp/src/IceBT/Instance.h
index f7e75f8ce71..c51a9018043 100644
--- a/cpp/src/IceBT/Instance.h
+++ b/cpp/src/IceBT/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_INSTANCE_H
#define ICE_BT_INSTANCE_H
diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h
index 8bc8e8e7b74..f9bdca08cec 100644
--- a/cpp/src/IceBT/InstanceF.h
+++ b/cpp/src/IceBT/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_INSTANCE_F_H
#define ICE_BT_INSTANCE_F_H
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
index 277a02f76c8..dad2e87a813 100644
--- a/cpp/src/IceBT/Makefile.mk
+++ b/cpp/src/IceBT/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
#
# Only build the IceBT plugin if Bluetooth system libraries are available (Bluez/DBus)
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
index b0a68be305a..e65952c7ccd 100644
--- a/cpp/src/IceBT/PluginI.cpp
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/PluginI.h>
#include <IceBT/EndpointI.h>
diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h
index 4bb603788ab..682576c6e4c 100644
--- a/cpp/src/IceBT/PluginI.h
+++ b/cpp/src/IceBT/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_PLUGIN_I_H
#define ICE_BT_PLUGIN_I_H
diff --git a/cpp/src/IceBT/StreamSocket.cpp b/cpp/src/IceBT/StreamSocket.cpp
index 400b2ea7382..39b09093b89 100644
--- a/cpp/src/IceBT/StreamSocket.cpp
+++ b/cpp/src/IceBT/StreamSocket.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/StreamSocket.h>
#include <IceBT/EndpointInfo.h>
diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h
index 62134210a3d..756e4a6be70 100644
--- a/cpp/src/IceBT/StreamSocket.h
+++ b/cpp/src/IceBT/StreamSocket.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_STREAM_SOCKET_H
#define ICE_BT_STREAM_SOCKET_H
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
index 0a4dc9503f8..e082e1548f8 100644
--- a/cpp/src/IceBT/TransceiverI.cpp
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/TransceiverI.h>
#include <IceBT/ConnectionInfo.h>
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index 09650cc8c62..4a9ca020efb 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_TRANSCEIVER_H
#define ICE_BT_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/Util.cpp b/cpp/src/IceBT/Util.cpp
index f02556ebd42..8f58a501f0c 100644
--- a/cpp/src/IceBT/Util.cpp
+++ b/cpp/src/IceBT/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBT/Util.h>
diff --git a/cpp/src/IceBT/Util.h b/cpp/src/IceBT/Util.h
index 777335f34ae..7c0652c03a9 100644
--- a/cpp/src/IceBT/Util.h
+++ b/cpp/src/IceBT/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_BT_UTIL_H
#define ICE_BT_UTIL_H
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index d92ca632b8d..da85420c93c 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/SliceChecksums.h>
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index 414b198117f..3ff43e8966d 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk
index f1a022dc512..746d09915d3 100644
--- a/cpp/src/IceBox/Makefile.mk
+++ b/cpp/src/IceBox/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceBox
$(project)_programs := icebox iceboxadmin
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 8fa8b96649c..c2c3132134e 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 13b2e2cd550..615fc047d29 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index a3ea4ca0616..a307c050dfc 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SERVICE_MANAGER_I_H
#define SERVICE_MANAGER_I_H
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index d0bc8e0d22f..5619360615d 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connection.h>
#include <Ice/ObjectAdapter.h>
diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk
index d1361bc0c19..0c1e034f68d 100644
--- a/cpp/src/IceBridge/Makefile.mk
+++ b/cpp/src/IceBridge/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icebridge
$(project)_dependencies := Ice
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
index 9f67ccca436..bce0ab96f0e 100644
--- a/cpp/src/IceDB/IceDB.cpp
+++ b/cpp/src/IceDB/IceDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceDB/IceDB.h>
#include <Ice/Initialize.h>
diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
index 6b62054038e..8019a9c30a9 100644
--- a/cpp/src/IceDB/IceDB.h
+++ b/cpp/src/IceDB/IceDB.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_DB_H
#define ICE_DB_H
diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk
index bcbd7c8a53a..396a9966d73 100644
--- a/cpp/src/IceDB/Makefile.mk
+++ b/cpp/src/IceDB/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceDB
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 9f89a664a6c..9647b404d17 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceDiscovery/LocatorI.h>
#include <IceDiscovery/LookupI.h>
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 0aa1361d861..34b8921b60f 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOCATORI_H
#define LOCATORI_H
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index 4640ec1903d..9908ff63ab7 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Connection.h>
#include <Ice/ObjectAdapter.h>
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index 5c78dfebbd2..348d69866b0 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOOKUPI_H
#define LOOKUPI_H
diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk
index ae78db9e910..a3644682e72 100644
--- a/cpp/src/IceDiscovery/Makefile.mk
+++ b/cpp/src/IceDiscovery/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceDiscovery
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index 4a2b10b9c4a..e488fbbc84c 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceDiscovery/PluginI.h b/cpp/src/IceDiscovery/PluginI.h
index e85a6a23b37..0a0e610b653 100644
--- a/cpp/src/IceDiscovery/PluginI.h
+++ b/cpp/src/IceDiscovery/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef PLUGIN_I_H
#define PLUGIN_I_H
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 590a0dff293..052939a377b 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ArgVector.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
index 56240e96b9b..f2eb0ff5a56 100644
--- a/cpp/src/IceGrid/Activator.h
+++ b/cpp/src/IceGrid/Activator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ACTIVATOR_H
#define ICE_GRID_ACTIVATOR_H
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 059e7621d56..818f75d640a 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index ac3d0265679..f0f8dd4f771 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADAPTERCACHE_H
#define ICE_GRID_ADAPTERCACHE_H
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp
index f338a5f5dee..3d58311845c 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.cpp
+++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/AdminCallbackRouter.h>
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index 4bab9ce23d6..67800fe1f97 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index fedb2684ef7..061c5d131b7 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 013b8873b50..4f37e4211de 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_I_H
#define ICE_GRID_ADMIN_I_H
diff --git a/cpp/src/IceGrid/AdminRouter.cpp b/cpp/src/IceGrid/AdminRouter.cpp
index 4b19c65a345..27c0fa9c0ae 100644
--- a/cpp/src/IceGrid/AdminRouter.cpp
+++ b/cpp/src/IceGrid/AdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/AdminRouter.h>
diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h
index 63f1cc92fb3..fcb988e1f06 100644
--- a/cpp/src/IceGrid/AdminRouter.h
+++ b/cpp/src/IceGrid/AdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ADMIN_ROUTER_H
#define ICE_GRID_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index ac7daf2ab61..947298e7842 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index e02a0e6a996..ee1d9c909d8 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_ADMINSESSIONI_H
#define ICEGRID_ADMINSESSIONI_H
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index 29c36b32450..35c1ad5b823 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/Allocatable.h>
#include <IceGrid/SessionI.h>
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index 20d82a23bd4..94f7fd2a183 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLE_H
#define ICE_GRID_ALLOCATABLE_H
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index d87fe6f4cf6..0f77b299ea1 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index 0cd2d2be768..19f60f2ba11 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index c614998943d..9e32c561d41 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_CACHE_H
#define ICE_GRID_CACHE_H
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index c6243e5acd8..6da67eb742e 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 45898db72cc..300865cf469 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index 656012b6633..877f1d25a6f 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DATABASE_H
#define ICE_GRID_DATABASE_H
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 0cbed7f794d..c6e2cbd4134 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index 90d50ef6b42..dfc1fa705db 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
#define ICE_GRID_DESCRIPTOR_BUILDER_H
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 4e80aeff179..c62bf1e622a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/DescriptorHelper.h>
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index 6de9017870a..a358870c98c 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
#define ICE_GRID_DESCRIPTOR_HELPER_H
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 6da1f347173..e7467acda1a 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceXML/Parser.h>
diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h
index 32caaf751dc..2e8f3e2b5f6 100644
--- a/cpp/src/IceGrid/DescriptorParser.h
+++ b/cpp/src/IceGrid/DescriptorParser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_DESCRIPTOR_PARSER_H
#define ICEGRID_DESCRIPTOR_PARSER_H
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 712eabb5afe..a93bca5440d 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
index 09cc0fa2c51..12751665402 100644
--- a/cpp/src/IceGrid/FileCache.h
+++ b/cpp/src/IceGrid/FileCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILE_CACHE_H
#define ICE_GRID_FILE_CACHE_H
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp
index 3cdec69cf68..fefe366a693 100644
--- a/cpp/src/IceGrid/FileParserI.cpp
+++ b/cpp/src/IceGrid/FileParserI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/FileParserI.h>
#include <IceGrid/DescriptorParser.h>
diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index b6c9cd8ebda..1762db9eb09 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILE_PARSERI_H
#define ICE_GRID_FILE_PARSERI_H
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
index 3c7a800b858..a9a1ef6dd77 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
index 40c95429be9..4630654082e 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.h
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index 6f8f9787d7e..652495f2296 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -66,11 +66,9 @@
#line 1 "src/IceGrid/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 31ea16bfa0b..1c4c5b1ec40 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 5a2d436bd8c..f80cf673236 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/Timer.h>
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index 3e0e804367e..34cea54dc50 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 2a299523216..10535a95d42 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index fb3998bcd1b..379743d6cf6 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h
index 50ec2f4c73d..9333650f7ae 100644
--- a/cpp/src/IceGrid/InternalRegistryI.h
+++ b/cpp/src/IceGrid/InternalRegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_INTERNALREGISTRYI_H
#define ICE_GRID_INTERNALREGISTRYI_H
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index d7d7d32560a..a66a5e037c3 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/LocatorI.h>
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 9c23511b17f..8eb5524fc04 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_LOCATOR_I_H
#define ICE_GRID_LOCATOR_I_H
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index da9d70d8506..52e254e2ee0 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/LocatorRegistryI.h>
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index ff7ddfebde0..eb7253fe9f9 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
#define ICE_GRID_LOCATOR_REGISTRY_I_H
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
index 401f3be40da..6a173c0031f 100644
--- a/cpp/src/IceGrid/Makefile.mk
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
local_node_srcs = Activator.cpp \
NodeAdminRouter.cpp \
diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp
index 4a77bd960fb..f739f6e06b2 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeAdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/NodeAdminRouter.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeAdminRouter.h b/cpp/src/IceGrid/NodeAdminRouter.h
index c613e1ef21b..795dfdbe12a 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.h
+++ b/cpp/src/IceGrid/NodeAdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_ADMIN_ROUTER_H
#define ICE_GRID_NODE_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 98789b954ce..1407c998f1c 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index 6b2a5b3995f..0230b7d05b2 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODECACHE_H
#define ICE_GRID_NODECACHE_H
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index c7dfb898f8a..8017fa3bdd4 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Timer.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index adc36d2ebff..5d3afb7f270 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_I_H
#define ICE_GRID_NODE_I_H
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 145cf9862f1..5f0a9d62b03 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index 3976a4d72e2..637f0ceac2f 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_NODE_SESSION_H
#define ICEGRID_NODE_SESSION_H
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 2cb50e7541a..c7cb4682a1a 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/NodeSessionManager.h>
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 2b85fec5cbb..139a0bdc028 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_NODE_SESSION_MANAGER_H
#define ICE_GRID_NODE_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp
index 5b6f54a4d0b..caa5a75d3db 100644
--- a/cpp/src/IceGrid/ObjectCache.cpp
+++ b/cpp/src/IceGrid/ObjectCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Random.h>
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index 94c84c2ad95..3ad01e04679 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_OBJECTCACHE_H
#define ICE_GRID_OBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 5364b51375b..704c84e9af5 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/IceUtil.h>
@@ -2525,7 +2523,7 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow,
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-present ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) ZeroC, Inc." << endl;
}
void
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index f23adf0bfaa..1197b4f55a6 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_PARSER_H
#define ICE_GRID_PARSER_H
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index bd5c6769dd4..dc90ad2b278 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h
index e1d018e1c22..e9ca4942eff 100644
--- a/cpp/src/IceGrid/PlatformInfo.h
+++ b/cpp/src/IceGrid/PlatformInfo.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_PLATFORM_INFO_H
#define ICE_GRID_PLATFORM_INFO_H
diff --git a/cpp/src/IceGrid/PluginFacadeI.cpp b/cpp/src/IceGrid/PluginFacadeI.cpp
index 8d086e5342b..2aab4145681 100644
--- a/cpp/src/IceGrid/PluginFacadeI.cpp
+++ b/cpp/src/IceGrid/PluginFacadeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/PluginFacadeI.h>
#include <IceGrid/PlatformInfo.h>
diff --git a/cpp/src/IceGrid/PluginFacadeI.h b/cpp/src/IceGrid/PluginFacadeI.h
index a9b2c7522ba..3972eee6b11 100644
--- a/cpp/src/IceGrid/PluginFacadeI.h
+++ b/cpp/src/IceGrid/PluginFacadeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_PLUGIN_FACADE_I_H
#define ICEGRID_PLUGIN_FACADE_I_H
diff --git a/cpp/src/IceGrid/QueryI.cpp b/cpp/src/IceGrid/QueryI.cpp
index e5c2555220b..e6f5b1ee090 100644
--- a/cpp/src/IceGrid/QueryI.cpp
+++ b/cpp/src/IceGrid/QueryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/Internal.h>
#include <IceGrid/QueryI.h>
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index 6a9a3a913a1..d9f9dec92c2 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_QUERY_I_H
#define ICE_GRID_QUERY_I_H
diff --git a/cpp/src/IceGrid/ReapThread.cpp b/cpp/src/IceGrid/ReapThread.cpp
index d7d7d2a2aaf..54626b1cdbf 100644
--- a/cpp/src/IceGrid/ReapThread.cpp
+++ b/cpp/src/IceGrid/ReapThread.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/ReapThread.h>
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index ed872adcc66..a847b9e720f 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_REAPER_THREAD_H
#define ICEGRID_REAPER_THREAD_H
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp
index 2ebaa8f4ad7..cb88ed843e8 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.cpp
+++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceGrid/RegistryAdminRouter.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h
index d0961c329ce..8deb750fd86 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryAdminRouter.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REGISTRY_ADMIN_ROUTER_H
#define ICE_GRID_REGISTRY_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index a6f4bc797b8..092ac2bf322 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index 18deac3daf5..7589bdada8b 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REGISTRYI_H
#define ICE_GRID_REGISTRYI_H
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index b5af05fa2e6..56cfac1d3e7 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index 0e006fa8381..9e38f0cadfd 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REPLICACACHE_H
#define ICE_GRID_REPLICACACHE_H
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 9d86958fa2d..6d9030fb886 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 5f30539a046..1977d7e9734 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_REPLICA_SESSION_H
#define ICEGRID_REPLICA_SESSION_H
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index d66fe69b313..da6f5cb4983 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/ReplicaSessionManager.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h
index 938fecbab60..9203bf49d87 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.h
+++ b/cpp/src/IceGrid/ReplicaSessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
#define ICE_GRID_REPLICA_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index f07d5fa1ec1..d4bc68b5140 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -462,11 +462,9 @@ char *yytext;
#line 1 "src/IceGrid/Scanner.l"
#line 2 "src/IceGrid/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index ba71ae83c6f..1de7e5def65 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Parser.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index e4a1df463a3..ef2e664cfbb 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/ServerAdapterI.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index ee7d9823aaf..ce818a7f8cc 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVER_ADAPTER_I_H
#define ICE_GRID_SERVER_ADAPTER_I_H
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index c9ebc4742a7..725b0b08757 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index 373af7bdfc1..15bee8989c6 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVERCACHE_H
#define ICE_GRID_SERVERCACHE_H
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 6ee41505409..62401c15c63 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index 5893dd7b9ac..6802fbd57c8 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SERVER_I_H
#define ICE_GRID_SERVER_I_H
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index cb693b56cc1..16b27d53d11 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index 631e1dcd176..5184bd2b19a 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_SESSIONI_H
#define ICEGRID_SESSIONI_H
diff --git a/cpp/src/IceGrid/SessionManager.cpp b/cpp/src/IceGrid/SessionManager.cpp
index eeb01f40204..646db8244a4 100644
--- a/cpp/src/IceGrid/SessionManager.cpp
+++ b/cpp/src/IceGrid/SessionManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/SessionManager.h>
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index 6c1a6255f13..03717f831c3 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SESSION_MANAGER_H
#define ICE_GRID_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index c52890fc7c0..58f9c0fbfab 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/UUID.h>
#include <Ice/LocalException.h>
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index 6dc75971002..766171e9ba5 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
#define ICE_GRID_SESSIONSERVANTLOCATOR_H
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index a2cf027f857..8ab60af908a 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Topics.h>
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 2d8992fd5b4..01288d76715 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_TOPICS_H
#define ICEGRID_TOPICS_H
diff --git a/cpp/src/IceGrid/TraceLevels.cpp b/cpp/src/IceGrid/TraceLevels.cpp
index 727c7d718e4..4d776d822f1 100644
--- a/cpp/src/IceGrid/TraceLevels.cpp
+++ b/cpp/src/IceGrid/TraceLevels.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Communicator.h>
#include <Ice/Properties.h>
diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h
index 4492781290f..43a2bbf66c5 100644
--- a/cpp/src/IceGrid/TraceLevels.h
+++ b/cpp/src/IceGrid/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_TRACE_LEVELS_H
#define ICE_GRID_TRACE_LEVELS_H
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index dc3cddfcccc..b77215d8de9 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/Util.h>
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index c917bd60923..8091e0738e7 100644
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_UTIL_H
#define ICE_GRID_UTIL_H
diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp
index 988e8092b60..9111fbd9534 100644
--- a/cpp/src/IceGrid/WaitQueue.cpp
+++ b/cpp/src/IceGrid/WaitQueue.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceGrid/WaitQueue.h>
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index 1cea39ce684..84edb2ba79a 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_WAIT_QUEUE_H
#define ICE_GRID_WAIT_QUEUE_H
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index 8e13d5abf0a..f4f7227bcd1 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Endpoint.h>
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 887fccfea65..6f921719e7c 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
#define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
index fb35c3ea36a..ce541ed1fc8 100644
--- a/cpp/src/IceGridLib/Makefile.mk
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceGrid
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 9170d094e26..6944d2cdad8 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICEGRID_API_EXPORTS
# define ICEGRID_API_EXPORTS
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
index 4de39d6e9a2..16a38ecb299 100644
--- a/cpp/src/IceIAP/Connector.h
+++ b/cpp/src/IceIAP/Connector.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_CONNECTOR_H
#define ICE_IAP_CONNECTOR_H
diff --git a/cpp/src/IceIAP/Connector.mm b/cpp/src/IceIAP/Connector.mm
index 9311cee422f..4db075443f5 100644
--- a/cpp/src/IceIAP/Connector.mm
+++ b/cpp/src/IceIAP/Connector.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Transceiver.h"
#include "EndpointI.h"
diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h
index 65d314e55cc..faabe7bd00f 100644
--- a/cpp/src/IceIAP/EndpointI.h
+++ b/cpp/src/IceIAP/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_ENDPOINT_I_H
#define ICE_IAP_ENDPOINT_I_H
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
index 8271778137c..82d2897e89b 100644
--- a/cpp/src/IceIAP/EndpointI.mm
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "EndpointI.h"
#include "Connector.h"
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
index 05bb62b010d..613c044e849 100644
--- a/cpp/src/IceIAP/Makefile.mk
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceIAP
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
index 6b7c57a2f3c..25c078524b1 100644
--- a/cpp/src/IceIAP/Transceiver.h
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_IAP_TRANSCEIVER_H
#define ICE_IAP_TRANSCEIVER_H
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
index b711b244017..794ffa15dd4 100644
--- a/cpp/src/IceIAP/Transceiver.mm
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Transceiver.h"
#include "EndpointI.h"
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk
index 91f08f2d1b1..26b8dc513a4 100644
--- a/cpp/src/IceLocatorDiscovery/Makefile.mk
+++ b/cpp/src/IceLocatorDiscovery/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceLocatorDiscovery
diff --git a/cpp/src/IceLocatorDiscovery/Plugin.h b/cpp/src/IceLocatorDiscovery/Plugin.h
index c8ba472d807..86997552d7a 100644
--- a/cpp/src/IceLocatorDiscovery/Plugin.h
+++ b/cpp/src/IceLocatorDiscovery/Plugin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
#define LOCATOR_DISCOVERY_PLUGIN_I_H
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index 7f97f8befe8..fde4c106e97 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 3c334e286e6..358f8631d6e 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 6ed6869a405..e63ff51781e 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 61eeb9f7b3d..f04e9319fa0 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h
index 881261bf51b..311b72535a9 100644
--- a/cpp/src/IcePatch2/FileServerI.h
+++ b/cpp/src/IcePatch2/FileServerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_FILE_SERVER_I_H
#define ICE_PATCH2_FILE_SERVER_I_H
diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk
index 451313dfff2..64a7baa4814 100644
--- a/cpp/src/IcePatch2/Makefile.mk
+++ b/cpp/src/IcePatch2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icepatch2server icepatch2client icepatch2calc
$(project)_dependencies := IcePatch2 Ice
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index dbd764a58fb..90bfd079d3a 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 0a6c39d7156..4e97d3a502e 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk
index 06d31352bdc..5f2fb0e7448 100644
--- a/cpp/src/IcePatch2Lib/Makefile.mk
+++ b/cpp/src/IcePatch2Lib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IcePatch2
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 11431fa4335..9bde18f915b 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// We need to include io.h first to get the proper signature for
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 203f27fe1fa..380510a36c2 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_PATCH2_UTIL_H
#define ICE_PATCH2_UTIL_H
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 9882df1bcd2..6cf2d88a77b 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/AcceptorI.h>
#include <IceSSL/EndpointI.h>
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index cb6316fbb11..d029026bb5a 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ACCEPTOR_I_H
#define ICESSL_ACCEPTOR_I_H
diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp
index 02eaab8c355..cb7e2d3ee39 100644
--- a/cpp/src/IceSSL/CertificateI.cpp
+++ b/cpp/src/IceSSL/CertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/IceSSL/CertificateI.h b/cpp/src/IceSSL/CertificateI.h
index e851d5a24ff..c7b617bbd45 100644
--- a/cpp/src/IceSSL/CertificateI.h
+++ b/cpp/src/IceSSL/CertificateI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CERTIFICATE_I_H
#define ICESSL_CERTIFICATE_I_H
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index b8d189192fa..1b5c2d53437 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/ConnectorI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index 27ec6644c58..5bc487a32e0 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_CONNECTOR_I_H
#define ICESSL_CONNECTOR_I_H
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index cfd1540093f..f028aeff5c5 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/EndpointI.h>
#include <IceSSL/AcceptorI.h>
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index ae04a3e6dd7..0c5d32bc98c 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENDPOINT_I_H
#define ICESSL_ENDPOINT_I_H
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 0b5079797e4..eedb94adfd0 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Instance.h>
#include <IceSSL/SSLEngine.h>
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index 0b56c77bc33..584fe0c54ca 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_INSTANCE_H
#define ICESSL_INSTANCE_H
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index d39f922b126..5f9b72106da 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_INSTANCE_F_H
#define ICESSL_INSTANCE_F_H
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
index 1bff174643a..d2b769784a1 100644
--- a/cpp/src/IceSSL/Makefile.mk
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceSSL
diff --git a/cpp/src/IceSSL/OpenSSLCertificateI.cpp b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
index 712b6b8199d..430fce90cab 100644
--- a/cpp/src/IceSSL/OpenSSLCertificateI.cpp
+++ b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/OpenSSL.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index e008094afb6..1cf3fa1c96b 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.h b/cpp/src/IceSSL/OpenSSLEngine.h
index 2fad7263ca9..0d77fb64db1 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.h
+++ b/cpp/src/IceSSL/OpenSSLEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_H
#define ICESSL_OPENSSL_ENGINE_H
diff --git a/cpp/src/IceSSL/OpenSSLEngineF.h b/cpp/src/IceSSL/OpenSSLEngineF.h
index 14413751979..433370c05f7 100644
--- a/cpp/src/IceSSL/OpenSSLEngineF.h
+++ b/cpp/src/IceSSL/OpenSSLEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_F_H
#define ICESSL_OPENSSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 0ce0b5e0fe2..79dbd386799 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/OpenSSL.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index 48e0bad02cf..9c0b260d9ac 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/OpenSSLTransceiverI.h>
#include <IceSSL/OpenSSLEngine.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index 21698549c42..94ad07f802a 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_TRANSCEIVER_I_H
#define ICESSL_OPENSSL_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp
index 513c5e510a2..52f99bb4a5b 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/OpenSSLUtil.h>
diff --git a/cpp/src/IceSSL/OpenSSLUtil.h b/cpp/src/IceSSL/OpenSSLUtil.h
index c113ee858d5..9a79c659706 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.h
+++ b/cpp/src/IceSSL/OpenSSLUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_OPENSSL_UTIL_I_H
#define ICESSL_OPENSSL_UTIL_I_H
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 10f5e9b26d4..a7d4c4737f4 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index 50befc27261..12c914c1f59 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_PLUGIN_I_H
#define ICESSL_PLUGIN_I_H
diff --git a/cpp/src/IceSSL/RFC2253.cpp b/cpp/src/IceSSL/RFC2253.cpp
index 4c1c540a5e6..2c3e6a24238 100644
--- a/cpp/src/IceSSL/RFC2253.cpp
+++ b/cpp/src/IceSSL/RFC2253.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h
index 44d9d677bde..a43b1ca800f 100644
--- a/cpp/src/IceSSL/RFC2253.h
+++ b/cpp/src/IceSSL/RFC2253.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_RFC_2253_H
#define ICESSL_RFC_2253_H
diff --git a/cpp/src/IceSSL/SChannelCertificateI.cpp b/cpp/src/IceSSL/SChannelCertificateI.cpp
index d817dc61923..a4a4564a599 100644
--- a/cpp/src/IceSSL/SChannelCertificateI.cpp
+++ b/cpp/src/IceSSL/SChannelCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/SChannel.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index 1dbbf390fd2..770988c3e90 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SChannelEngine.h>
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.h b/cpp/src/IceSSL/SChannelEngine.h
index c50e8cb6629..6d6b96d8481 100644
--- a/cpp/src/IceSSL/SChannelEngine.h
+++ b/cpp/src/IceSSL/SChannelEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_H
#define ICESSL_SCHANNEL_ENGINE_H
diff --git a/cpp/src/IceSSL/SChannelEngineF.h b/cpp/src/IceSSL/SChannelEngineF.h
index 879daa4d5d1..b4a93ae23cb 100644
--- a/cpp/src/IceSSL/SChannelEngineF.h
+++ b/cpp/src/IceSSL/SChannelEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_F_H
#define ICESSL_SCHANNEL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SChannelPluginI.cpp b/cpp/src/IceSSL/SChannelPluginI.cpp
index 694615743b3..951a1e29d6c 100644
--- a/cpp/src/IceSSL/SChannelPluginI.cpp
+++ b/cpp/src/IceSSL/SChannelPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/SChannelEngine.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index b879dab8798..8ffd5aac553 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index c183c6ff8fd..f21fd1ac205 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
#define ICESSL_SCHANNELTRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 56e74693671..4d139e4c7ce 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SSLEngine.h>
#include <IceSSL/TrustManager.h>
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index 57041bc16ad..eda5e816aca 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENGINE_H
#define ICESSL_ENGINE_H
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index f745756340d..ad965fbb2d0 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_ENGINE_F_H
#define ICESSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
index df9caf5c294..8ea6fb89f47 100644
--- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp
+++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Plugin.h>
#include <IceSSL/SecureTransport.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index a3304676bfe..cc2e3a4d4ee 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.h b/cpp/src/IceSSL/SecureTransportEngine.h
index a8bdf41d594..fbd97d6a616 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.h
+++ b/cpp/src/IceSSL/SecureTransportEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
#define ICESSL_SECURE_TRANSPORT_ENGINE_H
diff --git a/cpp/src/IceSSL/SecureTransportEngineF.h b/cpp/src/IceSSL/SecureTransportEngineF.h
index 565c5535c51..4869a0c7b97 100644
--- a/cpp/src/IceSSL/SecureTransportEngineF.h
+++ b/cpp/src/IceSSL/SecureTransportEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
#define ICESSL_SECURE_TRANSPORT_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportPluginI.cpp b/cpp/src/IceSSL/SecureTransportPluginI.cpp
index 7c4cdc375f3..1ecbeec21b7 100644
--- a/cpp/src/IceSSL/SecureTransportPluginI.cpp
+++ b/cpp/src/IceSSL/SecureTransportPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/SecureTransport.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 317da13705b..cc168b0ab94 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SecureTransportTransceiverI.h>
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index f3d84ef033b..04d9d26a98a 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
#define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp
index ac8d8f21e34..a3ae427d516 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.cpp
+++ b/cpp/src/IceSSL/SecureTransportUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/SecureTransportUtil.h>
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h
index 211d4b49c9c..088af9fc40c 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.h
+++ b/cpp/src/IceSSL/SecureTransportUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
#define ICESSL_SECURE_TRANSPORT_UTIL_H
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index 8f2352b70c6..551a4ba27ff 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/TrustManager.h>
#include <IceSSL/RFC2253.h>
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index ce9ba4d42dd..ba379a61eb1 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_H
#define ICESSL_TRUST_MANAGER_H
diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h
index ec11874eadd..606715e02ce 100644
--- a/cpp/src/IceSSL/TrustManagerF.h
+++ b/cpp/src/IceSSL/TrustManagerF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_F_H
#define ICESSL_TRUST_MANAGER_F_H
diff --git a/cpp/src/IceSSL/UWPCertificateI.cpp b/cpp/src/IceSSL/UWPCertificateI.cpp
index b5108e7bc23..7527d805894 100644
--- a/cpp/src/IceSSL/UWPCertificateI.cpp
+++ b/cpp/src/IceSSL/UWPCertificateI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// UWP Certificate implementation
diff --git a/cpp/src/IceSSL/UWPEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp
index f3be970d81b..d335dc259f4 100644
--- a/cpp/src/IceSSL/UWPEngine.cpp
+++ b/cpp/src/IceSSL/UWPEngine.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPEngine.h b/cpp/src/IceSSL/UWPEngine.h
index 701590131e4..36c535eb2e7 100644
--- a/cpp/src/IceSSL/UWPEngine.h
+++ b/cpp/src/IceSSL/UWPEngine.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_H
#define ICESSL_UWP_ENGINE_H
diff --git a/cpp/src/IceSSL/UWPEngineF.h b/cpp/src/IceSSL/UWPEngineF.h
index 634f0c594d8..d2b16581c78 100644
--- a/cpp/src/IceSSL/UWPEngineF.h
+++ b/cpp/src/IceSSL/UWPEngineF.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_F_H
#define ICESSL_UWP_ENGINE_F_H
diff --git a/cpp/src/IceSSL/UWPPluginI.cpp b/cpp/src/IceSSL/UWPPluginI.cpp
index a1d519496ba..19d09684318 100644
--- a/cpp/src/IceSSL/UWPPluginI.cpp
+++ b/cpp/src/IceSSL/UWPPluginI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/PluginI.h>
#include <IceSSL/UWPEngine.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index 50cc865ff0f..c9d7bfb788b 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceSSL/Config.h>
#include <IceSSL/UWPTransceiverI.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 272356c51be..a6d7cbbb29b 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UWP_TRANSCEIVER_I_H
#define ICESSL_UWP_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index f919115613b..0d04ab423cd 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
#if defined(_WIN32) && !defined(ICE_OS_UWP)
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 62b60e6598a..42d232d7fb3 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESSL_UTIL_H
#define ICESSL_UTIL_H
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 875ac412e36..22c6ed1ac09 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice
index 08dc5d22510..5d5c2a7a85f 100644
--- a/cpp/src/IceStorm/DBTypes.ice
+++ b/cpp/src/IceStorm/DBTypes.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice
index 8a7c47e558c..8b175c9b6ff 100644
--- a/cpp/src/IceStorm/Election.ice
+++ b/cpp/src/IceStorm/Election.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index aafd24e8559..f1207cb59a6 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -66,11 +66,9 @@
#line 1 "src/IceStorm/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index d60b83fccbf..2de164d74b3 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index 2cf9398428c..7eb11018ce0 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index 7f9d6ace1c0..302446d7070 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index f65d83f8353..ad22c9151ad 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Instance.h>
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h
index 19e9555327c..897ea2eaa55 100644
--- a/cpp/src/IceStorm/Instance.h
+++ b/cpp/src/IceStorm/Instance.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTANCE_H
#define INSTANCE_H
diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice
index 3dca295be82..dab31321dd5 100644
--- a/cpp/src/IceStorm/Instrumentation.ice
+++ b/cpp/src/IceStorm/Instrumentation.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index ded07c9a8b6..5675c261122 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/InstrumentationI.h>
diff --git a/cpp/src/IceStorm/InstrumentationI.h b/cpp/src/IceStorm/InstrumentationI.h
index 1f4b62504df..9627a72b3c9 100644
--- a/cpp/src/IceStorm/InstrumentationI.h
+++ b/cpp/src/IceStorm/InstrumentationI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef INSTRUMENTATION_I_H
#define INSTRUMENTATION_I_H
diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index 35b27b0542e..701a3c98c18 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice
index 0090a56f4a3..c6f9c619057 100644
--- a/cpp/src/IceStorm/LinkRecord.ice
+++ b/cpp/src/IceStorm/LinkRecord.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk
index 32a8b9a66fc..801093880b1 100644
--- a/cpp/src/IceStorm/Makefile.mk
+++ b/cpp/src/IceStorm/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceStormService
$(project)_programs := icestormadmin icestormdb
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index d87482bc5e6..78c4c04cbc3 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/NodeI.h>
diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h
index 9c3ca39a79d..5b0ba169def 100644
--- a/cpp/src/IceStorm/NodeI.h
+++ b/cpp/src/IceStorm/NodeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ELECTION_I_H
#define ELECTION_I_H
diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp
index 72dc9df1020..b38a2db5da5 100644
--- a/cpp/src/IceStorm/Observers.cpp
+++ b/cpp/src/IceStorm/Observers.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Observers.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h
index c98d0e44eff..89b26217b73 100644
--- a/cpp/src/IceStorm/Observers.h
+++ b/cpp/src/IceStorm/Observers.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef OBSERVERS_H
#define OBSERVERS_H
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 9b97c180983..ce06f05d322 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <Ice/Ice.h>
@@ -409,7 +407,7 @@ Parser::current(const list<string>& args)
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-present ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) ZeroC, Inc." << endl;
}
//
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index a696a4fe012..c297617f707 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_PARSER_H
#define ICE_STORM_PARSER_H
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index e0af5e778d6..f166a8db317 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef REPLICA_H
#define REPLICA_H
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index fa6ad378a91..ce0e4e36e64 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -462,11 +462,9 @@ char *yytext;
#line 1 "src/IceStorm/Scanner.l"
#line 2 "src/IceStorm/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index 47cd435feee..3789e14f62f 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <IceStorm/Parser.h>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 3beb25d9ab2..453d20a4c00 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#define ICESTORM_SERVICE_API_EXPORTS
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index a9991943395..11c7a80a2ad 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICESTORM_SERVICE_H
#define ICESTORM_SERVICE_H
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index cbc9aa03df6..0fb46848c3d 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Subscriber.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index e9d3ebc6f67..af5cc721f69 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SUBSCRIBER_H
#define SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice
index 98dd9dd6cf0..447c45f34f4 100644
--- a/cpp/src/IceStorm/SubscriberRecord.ice
+++ b/cpp/src/IceStorm/SubscriberRecord.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 269f9ab955a..480189c6387 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TopicI.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index be48eea9cfd..9597fb62558 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TOPIC_I_H
#define TOPIC_I_H
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 7e9d10890f6..74a64a2198a 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TopicManagerI.h>
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index 3a913082363..84cb47871cf 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TOPIC_MANAGER_I_H
#define TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index f0ee042b89b..afa45876c72 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 91f0d1e5903..02a4ac63452 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_STORM_TRACE_LEVELS_H
#define ICE_STORM_TRACE_LEVELS_H
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 014029a58bd..055d32caf60 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TransientTopicI.h>
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h
index da745330e7c..50b73d835f5 100644
--- a/cpp/src/IceStorm/TransientTopicI.h
+++ b/cpp/src/IceStorm/TransientTopicI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TRANSIENT_TOPIC_I_H
#define TRANSIENT_TOPIC_I_H
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 2e33a7ce8d2..56cc3d37f17 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/TransientTopicManagerI.h>
#include <IceStorm/TransientTopicI.h>
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h
index 49e617abb27..4051a941327 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.h
+++ b/cpp/src/IceStorm/TransientTopicManagerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TRANSIENT_TOPIC_MANAGER_I_H
#define TRANSIENT_TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
index 3d17d1d5a49..7eebdf80173 100644
--- a/cpp/src/IceStorm/Util.cpp
+++ b/cpp/src/IceStorm/Util.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceStorm/Util.h>
#include <IceStorm/SubscriberRecord.h>
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index d70943fb929..1ad63017219 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef UTIL_H
#define UTIL_H
diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk
index 317510ab5af..fb78568f1ec 100644
--- a/cpp/src/IceStormLib/Makefile.mk
+++ b/cpp/src/IceStormLib/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceStorm
diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp
index fd1f5855e02..bb99e968323 100644
--- a/cpp/src/IceUtil/ConsoleUtil.cpp
+++ b/cpp/src/IceUtil/ConsoleUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp
index 16fe10d14f5..6beed68dfc9 100644
--- a/cpp/src/IceUtil/ConvertUTF.cpp
+++ b/cpp/src/IceUtil/ConvertUTF.cpp
@@ -20,11 +20,9 @@
* remains attached.
*/
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
/* ---------------------------------------------------------------------
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index 5aa3f7df4d8..2b4b36540b8 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -20,11 +20,9 @@
* remains attached.
*/
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_CONVERT_UTF_H
#define ICE_UTIL_CONVERT_UTF_H
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index d0de08a6365..eae9ce10892 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef __sun
# define _POSIX_PTHREAD_SEMANTICS
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index 7a0d8a66cfd..c68c8a721af 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index f3dd98922c3..52027a56ac8 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/InputUtil.h>
#include <stdlib.h>
diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk
index 2f031256d36..be110f2d5e7 100644
--- a/cpp/src/IceUtil/Makefile.mk
+++ b/cpp/src/IceUtil/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceUtil
diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp
index fc278555666..f8b2e8aea28 100644
--- a/cpp/src/IceUtil/MutexProtocol.cpp
+++ b/cpp/src/IceUtil/MutexProtocol.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/MutexProtocol.h>
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 7baf57380f2..2f9d228cf72 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 9003b8e93fa..a917d3ae24a 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/OutputUtil.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index bcf2b233ad3..7f639f2e89f 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifdef _WIN32
# define _CRT_RAND_S
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 24465292486..099ecf28a62 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/RecMutex.h>
#include <IceUtil/Exception.h>
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 6250f1ab8bd..a385e191726 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Shared.h>
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index 292f87d5fc4..52f12c88cf2 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringConverter.h>
#include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 33848ba54cd..f78617c41dd 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/StringConverter.h>
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 8f047847146..2ba724a4a3c 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 68b953dbb2a..4c4dc4b68a4 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/Exception.h>
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 662807a86f2..452ee3fffb0 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/UUID.h>
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index 608d6306de4..2261eb48e9c 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index bdae437a5a4..564644a35b2 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_UTIL_UNICODE_H
#define ICE_UTIL_UNICODE_H
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp
index 4c8daaaf236..9231cc5fffa 100644
--- a/cpp/src/IceUtil/UtilException.cpp
+++ b/cpp/src/IceUtil/UtilException.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#if defined(_MSC_VER) && _MSC_VER >= 1700
//
diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk
index c6b9315c6ca..919176ea512 100644
--- a/cpp/src/IceXML/Makefile.mk
+++ b/cpp/src/IceXML/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := IceXML
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 1a1ad3e8c41..1463dc9c07a 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceXML/Parser.h>
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index 4ee32ea78b8..71101b7a55a 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_XML_PARSER_H
#define ICE_XML_PARSER_H
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 7d63961a941..cfcdda425e7 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/CPlusPlusUtil.h>
#include <Slice/Util.h>
@@ -512,11 +510,9 @@ void
Slice::printHeader(Output& out)
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h
index ac77f16f86a..b8fa3ad9e46 100644
--- a/cpp/src/Slice/CPlusPlusUtil.h
+++ b/cpp/src/Slice/CPlusPlusUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef C_PLUS_PLUS_UTIL_H
#define C_PLUS_PLUS_UTIL_H
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index d35fda1c921..98aa11291d8 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Checksum.h>
#include <Slice/MD5.h>
diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h
index ef86fc5784d..8be4395b12b 100644
--- a/cpp/src/Slice/Checksum.h
+++ b/cpp/src/Slice/Checksum.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_CHECKSUM_H
#define SLICE_CHECKSUM_H
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index 17eeefd1f2e..855ce45a168 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/FileTracker.h>
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
index 704004f9e6a..15446cddc20 100644
--- a/cpp/src/Slice/FileTracker.h
+++ b/cpp/src/Slice/FileTracker.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef FILE_TRACKER_H
#define FILE_TRACKER_H
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index d9ef1669a98..9d7b21e244f 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -73,11 +73,9 @@
#line 1 "src/Slice/Grammar.y"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 8c5776c78e2..a9af4724d8a 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 5ea716dbaae..082718126ce 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_GRAMMAR_UTIL_H
#define SLICE_GRAMMAR_UTIL_H
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3e81077a3ff..327e4b92a5d 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <Slice/JavaUtil.h>
@@ -785,11 +783,9 @@ void
Slice::JavaOutput::printHeader()
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
print(header);
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
index 8fdbeb38a51..326d7adfa1a 100644
--- a/cpp/src/Slice/JavaUtil.h
+++ b/cpp/src/Slice/JavaUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef JAVA_UTIL_H
#define JAVA_UTIL_H
diff --git a/cpp/src/Slice/MD5.cpp b/cpp/src/Slice/MD5.cpp
index d11ee1724c8..8d4130da12d 100644
--- a/cpp/src/Slice/MD5.cpp
+++ b/cpp/src/Slice/MD5.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/MD5.h>
#include <Slice/MD5I.h>
diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h
index 4314dfb68d0..073a9c8d550 100644
--- a/cpp/src/Slice/MD5.h
+++ b/cpp/src/Slice/MD5.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_MD5_H
#define SLICE_MD5_H
diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk
index 83a0bb90a0d..5e514e09d7f 100644
--- a/cpp/src/Slice/Makefile.mk
+++ b/cpp/src/Slice/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries := Slice
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp
index e6b31290a59..dbf21732161 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/Slice/PHPUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PHPUtil.h>
#include <functional>
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/Slice/PHPUtil.h
index ac61a0a6232..03f5d537ae6 100644
--- a/cpp/src/Slice/PHPUtil.h
+++ b/cpp/src/Slice/PHPUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PHP_UTIL_H
#define SLICE_PHP_UTIL_H
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index a2ad348fb17..e49c20f1c50 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index a36bd1154e5..77bbce0c6e1 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PARSER_H
#define SLICE_PARSER_H
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 35e4deeb89f..30430304020 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Preprocessor.h>
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
index b2130800f58..e9456ae1fbf 100644
--- a/cpp/src/Slice/Preprocessor.h
+++ b/cpp/src/Slice/Preprocessor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef PREPROCESSOR_H
#define PREPROCESSOR_H
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index c94ddfa212b..7f9abaccc3f 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/IceUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 55314440dd6..2637ca26321 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PythonUtil.h>
#include <Slice/Checksum.h>
@@ -3085,11 +3083,9 @@ void
Slice::Python::printHeader(IceUtilInternal::Output& out)
{
static const char* header =
-"# **********************************************************************\n"
"#\n"
-"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h
index 2dc69c1cc62..d1b0d656906 100644
--- a/cpp/src/Slice/PythonUtil.h
+++ b/cpp/src/Slice/PythonUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_PYTHON_UTIL_H
#define SLICE_PYTHON_UTIL_H
diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp
index 5e3b5ef2345..ff9f46730eb 100644
--- a/cpp/src/Slice/Ruby.cpp
+++ b/cpp/src/Slice/Ruby.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/Options.h>
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 6ec56cb5bb5..eea8791ec4c 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/RubyUtil.h>
#include <Slice/Checksum.h>
@@ -1561,11 +1559,9 @@ void
Slice::Ruby::printHeader(IceUtilInternal::Output& out)
{
static const char* header =
-"# **********************************************************************\n"
"#\n"
-"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h
index 69ad8f937e8..f5fb4413f68 100644
--- a/cpp/src/Slice/RubyUtil.h
+++ b/cpp/src/Slice/RubyUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_RUBY_UTIL_H
#define SLICE_RUBY_UTIL_H
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 6a0ba098cd8..0da441603bf 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -546,11 +546,9 @@ char *slice_text;
#line 1 "src/Slice/Scanner.l"
#line 2 "src/Slice/Scanner.l"
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
#include <Slice/Grammar.h>
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 8209d01265b..b93f13eb51b 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -1,10 +1,8 @@
%{
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
#include <Slice/Grammar.h>
diff --git a/cpp/src/Slice/SliceUtil.cpp b/cpp/src/Slice/SliceUtil.cpp
index f59a58818dd..d11003ca83c 100644
--- a/cpp/src/Slice/SliceUtil.cpp
+++ b/cpp/src/Slice/SliceUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Util.h>
#include <Slice/FileTracker.h>
diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp
index f2f1dd8a74c..00c4af6efd6 100644
--- a/cpp/src/Slice/StringLiteralUtil.cpp
+++ b/cpp/src/Slice/StringLiteralUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
index caa8ed321bb..24bf8ec0d3a 100644
--- a/cpp/src/Slice/Util.h
+++ b/cpp/src/Slice/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef SLICE_UTIL_H
#define SLICE_UTIL_H
diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index e24fbf7c2ed..0e738da2753 100644
--- a/cpp/src/icegriddb/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index b2b96f44688..cf6d2c83163 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index 2635bca3b22..7fdd82d590e 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_programs := icegriddb
$(project)_generated_includedir := $(project)/generated/IceGrid
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp
index 9e5b8890412..7f25ecb7058 100644
--- a/cpp/src/iceserviceinstall/Install.cpp
+++ b/cpp/src/iceserviceinstall/Install.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/Ice.h>
#include <Ice/ConsoleUtil.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index d42540093f9..87290996584 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ServiceInstaller.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index 78f181e9671..f9e498c5326 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef ICE_SERVICE_INSTALLER_H
#define ICE_SERVICE_INSTALLER_H
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index 81bc2488c5e..149e7ced295 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
#include <ConfluenceOutput.h>
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 912a1bc5262..dc6c714ef8f 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CONFLUENCE_OUTPUT
#define CONFLUENCE_OUTPUT
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index ac492c8d47b..f3b4dde5d70 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/FileUtil.h>
#include <IceUtil/Functional.h>
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index b85854ef7c3..16b6a1c0b64 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index f727095a663..c2a759fb9a5 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 959f612520c..6315c900650 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include "Gen.h"
#include <Slice/Util.h>
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 592b0efd785..c2e798135fd 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index f6229dcbb44..fe5a95aa995 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 4e855c42673..3c748ef88e9 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -1,9 +1,7 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <CsUtil.h>
#include <DotNetNames.h>
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
index c814fe311b3..0cfc81fe6ae 100644
--- a/cpp/src/slice2cs/CsUtil.h
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef CS_UTIL_H
#define CS_UTIL_H
diff --git a/cpp/src/slice2cs/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 88e102695d8..38649df2fa0 100644
--- a/cpp/src/slice2cs/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <DotNetNames.h>
#include <ctype.h>
diff --git a/cpp/src/slice2cs/DotNetNames.h b/cpp/src/slice2cs/DotNetNames.h
index 33ea863ac9b..9839c4f3e49 100644
--- a/cpp/src/slice2cs/DotNetNames.h
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef DOTNETNAMES_H
#define DOTNETNAMES_H
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 5fd2d18e11e..5b748b41a0a 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
@@ -2114,11 +2112,9 @@ void
Slice::Gen::printHeader()
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
_out << header;
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index b56de95fb65..b20c824e337 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index e5a43892c82..a3826690354 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 416349e991a..450f5211844 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 923c83f480a..268b82d9f5e 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index c7d24550e36..80eee9ac853 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 1bd2f742d6b..160ab5c238d 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Gen.h>
#include <Slice/Checksum.h>
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 4608a974b8b..d9e286d1ad9 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index 95ce5cf9b27..0f390f01057 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <GenCompat.h>
#include <Slice/Checksum.h>
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index 796d5332a58..8000f941d0d 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_COMPAT_H
#define GEN_COMPAT_H
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 171012dd7f7..d47fb0fd8f1 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index d0d80e9ddbd..1a6c60177b1 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Functional.h>
#include <IceUtil/StringUtil.h>
@@ -90,11 +88,9 @@ void
printHeader(IceUtilInternal::Output& out)
{
static const char* header =
- "// **********************************************************************\n"
"//\n"
- "// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+ "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 6ca2a1df8ec..e6ab5a23151 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index a5084be9160..ec5bbd8e098 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <JsUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index f8ae5400b57..6486ba111c6 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef JS_UTIL_H
#define JS_UTIL_H
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 9abb2ce7cc6..773ff82232e 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 98556847c02..0b3de868384 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/IceUtil.h>
@@ -256,7 +254,7 @@ writeCopyright(IceUtilInternal::Output& out, const string& file)
f = f.substr(pos + 1);
}
- out << nl << "% Copyright (c) 2003-present ZeroC, Inc. All rights reserved.";
+ out << nl << "% Copyright (c) ZeroC, Inc. All rights reserved.";
out << nl << "% Generated from " << f << " by slice2matlab version " << ICE_STRING_VERSION;
out << nl;
}
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 75133d6f0a1..725452eaf05 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/StringUtil.h>
#include <IceUtil/Functional.h>
@@ -878,11 +876,9 @@ void
Slice::Gen::printHeader(Output& o)
{
static const char* header =
-"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// **********************************************************************\n"
;
o << header;
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index b347331c1f5..812f3933d32 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef GEN_H
#define GEN_H
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index 064ffadff88..69e45d79088 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/Options.h>
#include <Slice/Preprocessor.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 3c323c52da6..7dd96a71688 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <ObjCUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index 64a58a1eeae..0c5176d67d8 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef OBJC_UTIL_H
#define OBJC_UTIL_H
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 12900e41943..b5d354af1fb 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/IceUtil.h>
@@ -1575,11 +1573,9 @@ static void
printHeader(IceUtilInternal::Output& out)
{
static const char* header =
- "// **********************************************************************\n"
"//\n"
- "// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
+ "// Copyright (c) ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// **********************************************************************\n"
;
out << header;
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index cf34e8cf4ec..79d17548cf7 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/PythonUtil.h>
#include <Slice/Util.h>
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index 167c5bdaa39..c6a6692111c 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Slice/RubyUtil.h>
#include <Slice/Util.h>