summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-12-18 20:16:32 +0100
committerJose <jose@zeroc.com>2018-12-18 20:16:32 +0100
commit6b6c459791802bb00aa29114e758e4d7b7a79c2b (patch)
tree271cedfbbeed24da4bdf3fe31da7654a023353d1 /cpp
parentFix copyright header (diff)
downloadice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.tar.bz2
ice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.tar.xz
ice-6b6c459791802bb00aa29114e758e4d7b7a79c2b.zip
Remove copyright notice
Diffstat (limited to 'cpp')
-rw-r--r--cpp/Makefile3
-rwxr-xr-xcpp/allTests.py3
-rw-r--r--cpp/config/Make.rules3
-rw-r--r--cpp/config/Make.xcodesdk.rules3
-rw-r--r--cpp/config/ice_ca.cnf3
-rw-r--r--cpp/config/templates.xml3
-rw-r--r--cpp/include/Glacier2/Application.h3
-rw-r--r--cpp/include/Glacier2/Config.h3
-rw-r--r--cpp/include/Glacier2/Glacier2.h3
-rw-r--r--cpp/include/Glacier2/NullPermissionsVerifier.h3
-rw-r--r--cpp/include/Glacier2/SessionHelper.h3
-rw-r--r--cpp/include/Ice/Application.h3
-rw-r--r--cpp/include/Ice/AsyncResult.h3
-rw-r--r--cpp/include/Ice/AsyncResultF.h3
-rw-r--r--cpp/include/Ice/BatchRequestInterceptor.h3
-rw-r--r--cpp/include/Ice/BatchRequestQueueF.h3
-rw-r--r--cpp/include/Ice/Buffer.h3
-rw-r--r--cpp/include/Ice/CommunicatorAsync.h3
-rw-r--r--cpp/include/Ice/Comparable.h3
-rw-r--r--cpp/include/Ice/Config.h3
-rw-r--r--cpp/include/Ice/ConnectionAsync.h3
-rw-r--r--cpp/include/Ice/ConnectionIF.h3
-rw-r--r--cpp/include/Ice/ConsoleUtil.h3
-rw-r--r--cpp/include/Ice/DefaultValueFactory.h3
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h3
-rw-r--r--cpp/include/Ice/Dispatcher.h3
-rw-r--r--cpp/include/Ice/DynamicLibrary.h3
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h3
-rw-r--r--cpp/include/Ice/Exception.h3
-rw-r--r--cpp/include/Ice/ExceptionHelpers.h3
-rw-r--r--cpp/include/Ice/FactoryTable.h3
-rw-r--r--cpp/include/Ice/FactoryTableInit.h3
-rw-r--r--cpp/include/Ice/Format.h3
-rw-r--r--cpp/include/Ice/Functional.h3
-rw-r--r--cpp/include/Ice/GCObject.h3
-rw-r--r--cpp/include/Ice/Handle.h3
-rw-r--r--cpp/include/Ice/Ice.h3
-rw-r--r--cpp/include/Ice/IconvStringConverter.h3
-rw-r--r--cpp/include/Ice/Incoming.h3
-rw-r--r--cpp/include/Ice/IncomingAsync.h3
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h3
-rw-r--r--cpp/include/Ice/Initialize.h3
-rw-r--r--cpp/include/Ice/InputStream.h3
-rw-r--r--cpp/include/Ice/InstanceF.h3
-rw-r--r--cpp/include/Ice/InterfaceByValue.h3
-rw-r--r--cpp/include/Ice/LocalObject.h3
-rw-r--r--cpp/include/Ice/LocalObjectF.h3
-rw-r--r--cpp/include/Ice/LoggerUtil.h3
-rw-r--r--cpp/include/Ice/MetricsAdminI.h3
-rw-r--r--cpp/include/Ice/MetricsFunctional.h3
-rw-r--r--cpp/include/Ice/MetricsObserverI.h3
-rw-r--r--cpp/include/Ice/NativePropertiesAdmin.h3
-rw-r--r--cpp/include/Ice/Object.h3
-rw-r--r--cpp/include/Ice/ObjectF.h3
-rw-r--r--cpp/include/Ice/ObserverHelper.h3
-rw-r--r--cpp/include/Ice/Optional.h3
-rw-r--r--cpp/include/Ice/OutgoingAsync.h3
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h3
-rw-r--r--cpp/include/Ice/OutputStream.h3
-rw-r--r--cpp/include/Ice/Protocol.h3
-rw-r--r--cpp/include/Ice/Proxy.h3
-rw-r--r--cpp/include/Ice/ProxyF.h3
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h3
-rw-r--r--cpp/include/Ice/ProxyHandle.h3
-rw-r--r--cpp/include/Ice/ReferenceF.h3
-rw-r--r--cpp/include/Ice/RegisterPlugins.h3
-rw-r--r--cpp/include/Ice/RequestHandlerF.h3
-rw-r--r--cpp/include/Ice/ResponseHandlerF.h3
-rw-r--r--cpp/include/Ice/SHA1.h3
-rw-r--r--cpp/include/Ice/ServantManagerF.h3
-rw-r--r--cpp/include/Ice/Service.h3
-rw-r--r--cpp/include/Ice/SliceChecksums.h3
-rw-r--r--cpp/include/Ice/SlicedData.h3
-rw-r--r--cpp/include/Ice/SlicedDataF.h3
-rw-r--r--cpp/include/Ice/StreamHelpers.h3
-rw-r--r--cpp/include/Ice/StringConverter.h3
-rw-r--r--cpp/include/Ice/ThreadPoolF.h3
-rw-r--r--cpp/include/Ice/UUID.h3
-rw-r--r--cpp/include/Ice/UniquePtr.h3
-rw-r--r--cpp/include/Ice/UniqueRef.h3
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h3
-rw-r--r--cpp/include/Ice/Value.h3
-rw-r--r--cpp/include/Ice/ValueF.h3
-rw-r--r--cpp/include/IceBT/IceBT.h3
-rw-r--r--cpp/include/IceBT/Makefile3
-rw-r--r--cpp/include/IceBT/Plugin.h3
-rw-r--r--cpp/include/IceBox/Config.h3
-rw-r--r--cpp/include/IceGrid/Config.h3
-rw-r--r--cpp/include/IceGrid/IceGrid.h3
-rw-r--r--cpp/include/IceGrid/ReplicaGroupFilter.h3
-rw-r--r--cpp/include/IceIAP/IceIAP.h3
-rw-r--r--cpp/include/IcePatch2/ClientUtil.h3
-rw-r--r--cpp/include/IcePatch2/Config.h3
-rw-r--r--cpp/include/IcePatch2/IcePatch2.h3
-rw-r--r--cpp/include/IceSSL/Config.h3
-rw-r--r--cpp/include/IceSSL/IceSSL.h3
-rw-r--r--cpp/include/IceSSL/OpenSSL.h3
-rw-r--r--cpp/include/IceSSL/Plugin.h3
-rw-r--r--cpp/include/IceSSL/SChannel.h3
-rw-r--r--cpp/include/IceSSL/SecureTransport.h3
-rw-r--r--cpp/include/IceSSL/UWP.h3
-rw-r--r--cpp/include/IceStorm/Config.h3
-rw-r--r--cpp/include/IceUtil/Atomic.h3
-rw-r--r--cpp/include/IceUtil/Cond.h3
-rw-r--r--cpp/include/IceUtil/Config.h3
-rw-r--r--cpp/include/IceUtil/ConsoleUtil.h3
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h3
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h3
-rw-r--r--cpp/include/IceUtil/DisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/Exception.h3
-rw-r--r--cpp/include/IceUtil/FileUtil.h3
-rw-r--r--cpp/include/IceUtil/Functional.h3
-rw-r--r--cpp/include/IceUtil/Handle.h3
-rw-r--r--cpp/include/IceUtil/IceUtil.h3
-rw-r--r--cpp/include/IceUtil/InputUtil.h3
-rw-r--r--cpp/include/IceUtil/Iterator.h3
-rw-r--r--cpp/include/IceUtil/Lock.h3
-rw-r--r--cpp/include/IceUtil/Monitor.h3
-rw-r--r--cpp/include/IceUtil/Mutex.h3
-rw-r--r--cpp/include/IceUtil/MutexProtocol.h3
-rw-r--r--cpp/include/IceUtil/MutexPtrLock.h3
-rw-r--r--cpp/include/IceUtil/MutexPtrTryLock.h3
-rw-r--r--cpp/include/IceUtil/Optional.h3
-rw-r--r--cpp/include/IceUtil/Options.h3
-rw-r--r--cpp/include/IceUtil/OutputUtil.h3
-rw-r--r--cpp/include/IceUtil/PopDisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/PushDisableWarnings.h3
-rw-r--r--cpp/include/IceUtil/Random.h3
-rw-r--r--cpp/include/IceUtil/RecMutex.h3
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h3
-rw-r--r--cpp/include/IceUtil/ScannerConfig.h3
-rw-r--r--cpp/include/IceUtil/ScopedArray.h3
-rw-r--r--cpp/include/IceUtil/Shared.h3
-rw-r--r--cpp/include/IceUtil/StopWatch.h3
-rw-r--r--cpp/include/IceUtil/StringConverter.h3
-rw-r--r--cpp/include/IceUtil/StringUtil.h3
-rw-r--r--cpp/include/IceUtil/Thread.h3
-rw-r--r--cpp/include/IceUtil/ThreadException.h3
-rw-r--r--cpp/include/IceUtil/Time.h3
-rw-r--r--cpp/include/IceUtil/Timer.h3
-rw-r--r--cpp/include/IceUtil/UUID.h3
-rw-r--r--cpp/include/IceUtil/UndefSysMacros.h3
-rw-r--r--cpp/src/Glacier2/Blobject.cpp3
-rw-r--r--cpp/src/Glacier2/Blobject.h3
-rw-r--r--cpp/src/Glacier2/ClientBlobject.cpp3
-rw-r--r--cpp/src/Glacier2/ClientBlobject.h3
-rw-r--r--cpp/src/Glacier2/FilterI.cpp3
-rw-r--r--cpp/src/Glacier2/FilterI.h3
-rw-r--r--cpp/src/Glacier2/FilterManager.cpp3
-rw-r--r--cpp/src/Glacier2/FilterManager.h3
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp3
-rw-r--r--cpp/src/Glacier2/Instance.cpp3
-rw-r--r--cpp/src/Glacier2/Instance.h3
-rw-r--r--cpp/src/Glacier2/Instrumentation.ice3
-rw-r--r--cpp/src/Glacier2/InstrumentationI.cpp3
-rw-r--r--cpp/src/Glacier2/InstrumentationI.h3
-rw-r--r--cpp/src/Glacier2/Makefile.mk3
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.cpp3
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.h3
-rw-r--r--cpp/src/Glacier2/RequestQueue.cpp3
-rw-r--r--cpp/src/Glacier2/RequestQueue.h3
-rw-r--r--cpp/src/Glacier2/RouterI.cpp3
-rw-r--r--cpp/src/Glacier2/RouterI.h3
-rw-r--r--cpp/src/Glacier2/RoutingTable.cpp3
-rw-r--r--cpp/src/Glacier2/RoutingTable.h3
-rw-r--r--cpp/src/Glacier2/ServerBlobject.cpp3
-rw-r--r--cpp/src/Glacier2/ServerBlobject.h3
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp3
-rw-r--r--cpp/src/Glacier2/SessionRouterI.h3
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp3
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk3
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp3
-rw-r--r--cpp/src/Glacier2Lib/Makefile.mk3
-rw-r--r--cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp3
-rw-r--r--cpp/src/Glacier2Lib/SessionHelper.cpp3
-rw-r--r--cpp/src/Ice/ACM.cpp3
-rw-r--r--cpp/src/Ice/ACM.h3
-rw-r--r--cpp/src/Ice/ACMF.h3
-rw-r--r--cpp/src/Ice/Acceptor.cpp3
-rw-r--r--cpp/src/Ice/Acceptor.h3
-rw-r--r--cpp/src/Ice/AcceptorF.h3
-rw-r--r--cpp/src/Ice/Application.cpp3
-rw-r--r--cpp/src/Ice/ArgVector.cpp3
-rw-r--r--cpp/src/Ice/ArgVector.h3
-rw-r--r--cpp/src/Ice/AsyncResult.cpp3
-rw-r--r--cpp/src/Ice/Base64.cpp3
-rw-r--r--cpp/src/Ice/Base64.h3
-rw-r--r--cpp/src/Ice/BatchRequestQueue.cpp3
-rw-r--r--cpp/src/Ice/BatchRequestQueue.h3
-rw-r--r--cpp/src/Ice/Buffer.cpp3
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/CollocatedRequestHandler.h3
-rw-r--r--cpp/src/Ice/CommunicatorI.cpp3
-rw-r--r--cpp/src/Ice/CommunicatorI.h3
-rw-r--r--cpp/src/Ice/Cond.cpp3
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.h3
-rw-r--r--cpp/src/Ice/ConnectRequestHandlerF.h3
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp3
-rw-r--r--cpp/src/Ice/ConnectionFactory.h3
-rw-r--r--cpp/src/Ice/ConnectionFactoryF.h3
-rw-r--r--cpp/src/Ice/ConnectionI.cpp3
-rw-r--r--cpp/src/Ice/ConnectionI.h3
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.cpp3
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.h3
-rw-r--r--cpp/src/Ice/Connector.cpp3
-rw-r--r--cpp/src/Ice/Connector.h3
-rw-r--r--cpp/src/Ice/ConnectorF.h3
-rw-r--r--cpp/src/Ice/CountDownLatch.cpp3
-rw-r--r--cpp/src/Ice/DLLMain.cpp3
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.cpp3
-rw-r--r--cpp/src/Ice/DefaultsAndOverrides.h3
-rw-r--r--cpp/src/Ice/DefaultsAndOverridesF.h3
-rw-r--r--cpp/src/Ice/DispatchInterceptor.cpp3
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactory.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactory.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryF.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.cpp3
-rw-r--r--cpp/src/Ice/EndpointFactoryManager.h3
-rw-r--r--cpp/src/Ice/EndpointFactoryManagerF.h3
-rw-r--r--cpp/src/Ice/EndpointI.cpp3
-rw-r--r--cpp/src/Ice/EndpointI.h3
-rw-r--r--cpp/src/Ice/EndpointIF.h3
-rw-r--r--cpp/src/Ice/EventHandler.cpp3
-rw-r--r--cpp/src/Ice/EventHandler.h3
-rw-r--r--cpp/src/Ice/EventHandlerF.h3
-rwxr-xr-xcpp/src/Ice/EventLoggerMsg.mc3
-rw-r--r--cpp/src/Ice/Exception.cpp3
-rw-r--r--cpp/src/Ice/FactoryTable.cpp3
-rw-r--r--cpp/src/Ice/FactoryTableInit.cpp3
-rw-r--r--cpp/src/Ice/GCObject.cpp3
-rw-r--r--cpp/src/Ice/HashUtil.h3
-rw-r--r--cpp/src/Ice/HttpParser.cpp3
-rw-r--r--cpp/src/Ice/HttpParser.h3
-rw-r--r--cpp/src/Ice/IPEndpointI.cpp3
-rw-r--r--cpp/src/Ice/IPEndpointI.h3
-rw-r--r--cpp/src/Ice/IPEndpointIF.h3
-rw-r--r--cpp/src/Ice/IconvStringConverter.cpp3
-rw-r--r--cpp/src/Ice/ImplicitContextI.cpp3
-rw-r--r--cpp/src/Ice/ImplicitContextI.h3
-rw-r--r--cpp/src/Ice/Incoming.cpp3
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp3
-rw-r--r--cpp/src/Ice/IncomingRequest.h3
-rw-r--r--cpp/src/Ice/Initialize.cpp3
-rw-r--r--cpp/src/Ice/InputStream.cpp3
-rw-r--r--cpp/src/Ice/Instance.cpp3
-rw-r--r--cpp/src/Ice/Instance.h3
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp3
-rw-r--r--cpp/src/Ice/InstrumentationI.h3
-rw-r--r--cpp/src/Ice/LocalObject.cpp3
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp3
-rw-r--r--cpp/src/Ice/LocatorInfo.h3
-rw-r--r--cpp/src/Ice/LocatorInfoF.h3
-rw-r--r--cpp/src/Ice/LoggerAdminI.cpp3
-rw-r--r--cpp/src/Ice/LoggerAdminI.h3
-rw-r--r--cpp/src/Ice/LoggerI.cpp3
-rw-r--r--cpp/src/Ice/LoggerI.h3
-rw-r--r--cpp/src/Ice/LoggerUtil.cpp3
-rw-r--r--cpp/src/Ice/Makefile.mk3
-rw-r--r--cpp/src/Ice/MetricsAdminI.cpp3
-rw-r--r--cpp/src/Ice/MetricsObserverI.cpp3
-rwxr-xr-xcpp/src/Ice/Network.cpp3
-rwxr-xr-xcpp/src/Ice/Network.h3
-rw-r--r--cpp/src/Ice/NetworkF.h3
-rw-r--r--cpp/src/Ice/NetworkProxy.cpp3
-rw-r--r--cpp/src/Ice/NetworkProxy.h3
-rw-r--r--cpp/src/Ice/NetworkProxyF.h3
-rw-r--r--cpp/src/Ice/Object.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactory.h3
-rw-r--r--cpp/src/Ice/ObjectAdapterFactoryF.h3
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp3
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h3
-rw-r--r--cpp/src/Ice/ObserverHelper.cpp3
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.cpp3
-rw-r--r--cpp/src/Ice/OpaqueEndpointI.h3
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp3
-rw-r--r--cpp/src/Ice/OutputStream.cpp3
-rw-r--r--cpp/src/Ice/PluginManagerI.cpp3
-rw-r--r--cpp/src/Ice/PluginManagerI.h3
-rw-r--r--cpp/src/Ice/PropertiesAdminI.cpp3
-rw-r--r--cpp/src/Ice/PropertiesAdminI.h3
-rw-r--r--cpp/src/Ice/PropertiesI.cpp3
-rw-r--r--cpp/src/Ice/PropertiesI.h3
-rw-r--r--cpp/src/Ice/PropertyNames.cpp3
-rw-r--r--cpp/src/Ice/PropertyNames.h3
-rw-r--r--cpp/src/Ice/Protocol.cpp3
-rw-r--r--cpp/src/Ice/ProtocolInstance.cpp3
-rw-r--r--cpp/src/Ice/ProtocolInstance.h3
-rw-r--r--cpp/src/Ice/ProtocolInstanceF.h3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.cpp3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacade.h3
-rw-r--r--cpp/src/Ice/ProtocolPluginFacadeF.h3
-rw-r--r--cpp/src/Ice/Proxy.cpp3
-rw-r--r--cpp/src/Ice/ProxyFactory.cpp3
-rw-r--r--cpp/src/Ice/ProxyFactory.h3
-rw-r--r--cpp/src/Ice/Reference.cpp3
-rw-r--r--cpp/src/Ice/Reference.h3
-rw-r--r--cpp/src/Ice/ReferenceFactory.cpp3
-rw-r--r--cpp/src/Ice/ReferenceFactory.h3
-rw-r--r--cpp/src/Ice/ReferenceFactoryF.h3
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.cpp3
-rw-r--r--cpp/src/Ice/RegisterPluginsInit.h3
-rw-r--r--cpp/src/Ice/ReplyStatus.h3
-rw-r--r--cpp/src/Ice/RequestHandler.cpp3
-rw-r--r--cpp/src/Ice/RequestHandler.h3
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.cpp3
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.h3
-rw-r--r--cpp/src/Ice/ResponseHandler.cpp3
-rw-r--r--cpp/src/Ice/ResponseHandler.h3
-rw-r--r--cpp/src/Ice/RetryQueue.cpp3
-rw-r--r--cpp/src/Ice/RetryQueue.h3
-rw-r--r--cpp/src/Ice/RetryQueueF.h3
-rw-r--r--cpp/src/Ice/RouterInfo.cpp3
-rw-r--r--cpp/src/Ice/RouterInfo.h3
-rw-r--r--cpp/src/Ice/RouterInfoF.h3
-rw-r--r--cpp/src/Ice/SHA1.cpp3
-rw-r--r--cpp/src/Ice/Selector.cpp3
-rw-r--r--cpp/src/Ice/Selector.h3
-rw-r--r--cpp/src/Ice/ServantManager.cpp3
-rw-r--r--cpp/src/Ice/ServantManager.h3
-rw-r--r--cpp/src/Ice/Service.cpp3
-rw-r--r--cpp/src/Ice/SharedContext.h3
-rw-r--r--cpp/src/Ice/SliceChecksums.cpp3
-rw-r--r--cpp/src/Ice/SlicedData.cpp3
-rwxr-xr-xcpp/src/Ice/StreamSocket.cpp3
-rw-r--r--cpp/src/Ice/StreamSocket.h3
-rw-r--r--cpp/src/Ice/StringConverterPlugin.cpp3
-rw-r--r--cpp/src/Ice/StringUtil.h3
-rw-r--r--cpp/src/Ice/SysLoggerI.cpp3
-rw-r--r--cpp/src/Ice/SysLoggerI.h3
-rw-r--r--cpp/src/Ice/SystemdJournalI.cpp3
-rw-r--r--cpp/src/Ice/SystemdJournalI.h3
-rwxr-xr-xcpp/src/Ice/TcpAcceptor.cpp3
-rw-r--r--cpp/src/Ice/TcpAcceptor.h3
-rw-r--r--cpp/src/Ice/TcpConnector.cpp3
-rw-r--r--cpp/src/Ice/TcpConnector.h3
-rw-r--r--cpp/src/Ice/TcpEndpointI.cpp3
-rw-r--r--cpp/src/Ice/TcpEndpointI.h3
-rw-r--r--cpp/src/Ice/TcpTransceiver.cpp3
-rw-r--r--cpp/src/Ice/TcpTransceiver.h3
-rw-r--r--cpp/src/Ice/Thread.cpp3
-rw-r--r--cpp/src/Ice/ThreadPool.cpp3
-rw-r--r--cpp/src/Ice/ThreadPool.h3
-rw-r--r--cpp/src/Ice/Timer.cpp3
-rw-r--r--cpp/src/Ice/TraceLevels.cpp3
-rw-r--r--cpp/src/Ice/TraceLevels.h3
-rw-r--r--cpp/src/Ice/TraceLevelsF.h3
-rw-r--r--cpp/src/Ice/TraceUtil.cpp3
-rw-r--r--cpp/src/Ice/TraceUtil.h3
-rw-r--r--cpp/src/Ice/Transceiver.cpp3
-rw-r--r--cpp/src/Ice/Transceiver.h3
-rw-r--r--cpp/src/Ice/TransceiverF.h3
-rw-r--r--cpp/src/Ice/UdpConnector.cpp3
-rw-r--r--cpp/src/Ice/UdpConnector.h3
-rw-r--r--cpp/src/Ice/UdpEndpointI.cpp3
-rw-r--r--cpp/src/Ice/UdpEndpointI.h3
-rwxr-xr-xcpp/src/Ice/UdpTransceiver.cpp3
-rw-r--r--cpp/src/Ice/UdpTransceiver.h3
-rw-r--r--cpp/src/Ice/Value.cpp3
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.cpp3
-rw-r--r--cpp/src/Ice/ValueFactoryManagerI.h3
-rw-r--r--cpp/src/Ice/VirtualShared.h3
-rw-r--r--cpp/src/Ice/WSAcceptor.cpp3
-rw-r--r--cpp/src/Ice/WSAcceptor.h3
-rw-r--r--cpp/src/Ice/WSConnector.cpp3
-rw-r--r--cpp/src/Ice/WSConnector.h3
-rw-r--r--cpp/src/Ice/WSEndpoint.cpp3
-rw-r--r--cpp/src/Ice/WSEndpoint.h3
-rw-r--r--cpp/src/Ice/WSTransceiver.cpp3
-rw-r--r--cpp/src/Ice/WSTransceiver.h3
-rw-r--r--cpp/src/Ice/ios/Notifications.mm3
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamAcceptor.h3
-rw-r--r--cpp/src/Ice/ios/StreamConnector.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamConnector.h3
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamEndpointI.h3
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.cpp3
-rw-r--r--cpp/src/Ice/ios/StreamTransceiver.h3
-rw-r--r--cpp/src/IceBT/AcceptorI.cpp3
-rw-r--r--cpp/src/IceBT/AcceptorI.h3
-rw-r--r--cpp/src/IceBT/Config.h3
-rw-r--r--cpp/src/IceBT/ConnectorI.cpp3
-rw-r--r--cpp/src/IceBT/ConnectorI.h3
-rw-r--r--cpp/src/IceBT/DBus.cpp3
-rw-r--r--cpp/src/IceBT/DBus.h3
-rw-r--r--cpp/src/IceBT/EndpointI.cpp3
-rw-r--r--cpp/src/IceBT/EndpointI.h3
-rw-r--r--cpp/src/IceBT/Engine.cpp3
-rw-r--r--cpp/src/IceBT/Engine.h3
-rw-r--r--cpp/src/IceBT/EngineF.h3
-rw-r--r--cpp/src/IceBT/Instance.cpp3
-rw-r--r--cpp/src/IceBT/Instance.h3
-rw-r--r--cpp/src/IceBT/InstanceF.h3
-rw-r--r--cpp/src/IceBT/Makefile.mk3
-rw-r--r--cpp/src/IceBT/PluginI.cpp3
-rw-r--r--cpp/src/IceBT/PluginI.h3
-rw-r--r--cpp/src/IceBT/StreamSocket.cpp3
-rw-r--r--cpp/src/IceBT/StreamSocket.h3
-rw-r--r--cpp/src/IceBT/TransceiverI.cpp3
-rw-r--r--cpp/src/IceBT/TransceiverI.h3
-rw-r--r--cpp/src/IceBT/Util.cpp3
-rw-r--r--cpp/src/IceBT/Util.h3
-rw-r--r--cpp/src/IceBox/Admin.cpp3
-rw-r--r--cpp/src/IceBox/Exception.cpp3
-rw-r--r--cpp/src/IceBox/Makefile.mk3
-rw-r--r--cpp/src/IceBox/Service.cpp3
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp3
-rw-r--r--cpp/src/IceBox/ServiceManagerI.h3
-rw-r--r--cpp/src/IceBridge/IceBridge.cpp3
-rw-r--r--cpp/src/IceBridge/Makefile.mk3
-rw-r--r--cpp/src/IceDB/IceDB.cpp3
-rw-r--r--cpp/src/IceDB/IceDB.h3
-rw-r--r--cpp/src/IceDB/Makefile.mk3
-rw-r--r--cpp/src/IceDiscovery/LocatorI.cpp3
-rw-r--r--cpp/src/IceDiscovery/LocatorI.h3
-rw-r--r--cpp/src/IceDiscovery/LookupI.cpp3
-rw-r--r--cpp/src/IceDiscovery/LookupI.h3
-rw-r--r--cpp/src/IceDiscovery/Makefile.mk3
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp3
-rw-r--r--cpp/src/IceDiscovery/PluginI.h3
-rw-r--r--cpp/src/IceGrid/Activator.cpp3
-rw-r--r--cpp/src/IceGrid/Activator.h3
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp3
-rw-r--r--cpp/src/IceGrid/AdapterCache.h3
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.cpp3
-rw-r--r--cpp/src/IceGrid/AdminCallbackRouter.h3
-rw-r--r--cpp/src/IceGrid/AdminI.cpp3
-rw-r--r--cpp/src/IceGrid/AdminI.h3
-rw-r--r--cpp/src/IceGrid/AdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/AdminRouter.h3
-rw-r--r--cpp/src/IceGrid/AdminSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/AdminSessionI.h3
-rw-r--r--cpp/src/IceGrid/Allocatable.cpp3
-rw-r--r--cpp/src/IceGrid/Allocatable.h3
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp3
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.h3
-rw-r--r--cpp/src/IceGrid/Cache.h3
-rw-r--r--cpp/src/IceGrid/Client.cpp3
-rw-r--r--cpp/src/IceGrid/Database.cpp3
-rw-r--r--cpp/src/IceGrid/Database.h3
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.h3
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.h3
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp3
-rw-r--r--cpp/src/IceGrid/DescriptorParser.h3
-rw-r--r--cpp/src/IceGrid/FileCache.cpp3
-rw-r--r--cpp/src/IceGrid/FileCache.h3
-rw-r--r--cpp/src/IceGrid/FileParserI.cpp3
-rw-r--r--cpp/src/IceGrid/FileParserI.h3
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.cpp3
-rw-r--r--cpp/src/IceGrid/FileUserAccountMapperI.h3
-rw-r--r--cpp/src/IceGrid/Grammar.cpp3
-rw-r--r--cpp/src/IceGrid/Grammar.y3
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp3
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.cpp3
-rw-r--r--cpp/src/IceGrid/Internal.ice3
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/InternalRegistryI.h3
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp3
-rw-r--r--cpp/src/IceGrid/LocatorI.h3
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/LocatorRegistryI.h3
-rw-r--r--cpp/src/IceGrid/Makefile.mk3
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/NodeAdminRouter.h3
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp3
-rw-r--r--cpp/src/IceGrid/NodeCache.h3
-rw-r--r--cpp/src/IceGrid/NodeI.cpp3
-rw-r--r--cpp/src/IceGrid/NodeI.h3
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/NodeSessionI.h3
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/NodeSessionManager.h3
-rw-r--r--cpp/src/IceGrid/ObjectCache.cpp3
-rw-r--r--cpp/src/IceGrid/ObjectCache.h3
-rw-r--r--cpp/src/IceGrid/Parser.cpp3
-rw-r--r--cpp/src/IceGrid/Parser.h3
-rw-r--r--cpp/src/IceGrid/PlatformInfo.cpp3
-rw-r--r--cpp/src/IceGrid/PlatformInfo.h3
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.cpp3
-rw-r--r--cpp/src/IceGrid/PluginFacadeI.h3
-rw-r--r--cpp/src/IceGrid/QueryI.cpp3
-rw-r--r--cpp/src/IceGrid/QueryI.h3
-rw-r--r--cpp/src/IceGrid/ReapThread.cpp3
-rw-r--r--cpp/src/IceGrid/ReapThread.h3
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.cpp3
-rw-r--r--cpp/src/IceGrid/RegistryAdminRouter.h3
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp3
-rw-r--r--cpp/src/IceGrid/RegistryI.h3
-rw-r--r--cpp/src/IceGrid/ReplicaCache.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaCache.h3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.h3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.h3
-rw-r--r--cpp/src/IceGrid/Scanner.cpp3
-rw-r--r--cpp/src/IceGrid/Scanner.l3
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.cpp3
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.h3
-rw-r--r--cpp/src/IceGrid/ServerCache.cpp3
-rw-r--r--cpp/src/IceGrid/ServerCache.h3
-rw-r--r--cpp/src/IceGrid/ServerI.cpp3
-rw-r--r--cpp/src/IceGrid/ServerI.h3
-rw-r--r--cpp/src/IceGrid/SessionI.cpp3
-rw-r--r--cpp/src/IceGrid/SessionI.h3
-rw-r--r--cpp/src/IceGrid/SessionManager.cpp3
-rw-r--r--cpp/src/IceGrid/SessionManager.h3
-rw-r--r--cpp/src/IceGrid/SessionServantManager.cpp3
-rw-r--r--cpp/src/IceGrid/SessionServantManager.h3
-rw-r--r--cpp/src/IceGrid/Topics.cpp3
-rw-r--r--cpp/src/IceGrid/Topics.h3
-rw-r--r--cpp/src/IceGrid/TraceLevels.cpp3
-rw-r--r--cpp/src/IceGrid/TraceLevels.h3
-rw-r--r--cpp/src/IceGrid/Util.cpp3
-rw-r--r--cpp/src/IceGrid/Util.h3
-rw-r--r--cpp/src/IceGrid/WaitQueue.cpp3
-rw-r--r--cpp/src/IceGrid/WaitQueue.h3
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.cpp3
-rw-r--r--cpp/src/IceGrid/WellKnownObjectsManager.h3
-rw-r--r--cpp/src/IceGridLib/Makefile.mk3
-rw-r--r--cpp/src/IceGridLib/PluginFacadeI.cpp3
-rw-r--r--cpp/src/IceIAP/Connector.h3
-rw-r--r--cpp/src/IceIAP/Connector.mm3
-rw-r--r--cpp/src/IceIAP/EndpointI.h3
-rw-r--r--cpp/src/IceIAP/EndpointI.mm3
-rw-r--r--cpp/src/IceIAP/Makefile.mk3
-rw-r--r--cpp/src/IceIAP/Transceiver.h3
-rw-r--r--cpp/src/IceIAP/Transceiver.mm3
-rw-r--r--cpp/src/IceLocatorDiscovery/Makefile.mk3
-rw-r--r--cpp/src/IceLocatorDiscovery/Plugin.h3
-rw-r--r--cpp/src/IceLocatorDiscovery/PluginI.cpp3
-rw-r--r--cpp/src/IcePatch2/Calc.cpp3
-rw-r--r--cpp/src/IcePatch2/Client.cpp3
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp3
-rw-r--r--cpp/src/IcePatch2/FileServerI.h3
-rw-r--r--cpp/src/IcePatch2/Makefile.mk3
-rw-r--r--cpp/src/IcePatch2/Server.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/ClientUtil.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/Makefile.mk3
-rw-r--r--cpp/src/IcePatch2Lib/Util.cpp3
-rw-r--r--cpp/src/IcePatch2Lib/Util.h3
-rw-r--r--cpp/src/IceSSL/AcceptorI.cpp3
-rw-r--r--cpp/src/IceSSL/AcceptorI.h3
-rw-r--r--cpp/src/IceSSL/CertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/CertificateI.h3
-rw-r--r--cpp/src/IceSSL/ConnectorI.cpp3
-rw-r--r--cpp/src/IceSSL/ConnectorI.h3
-rw-r--r--cpp/src/IceSSL/EndpointI.cpp3
-rw-r--r--cpp/src/IceSSL/EndpointI.h3
-rw-r--r--cpp/src/IceSSL/Instance.cpp3
-rw-r--r--cpp/src/IceSSL/Instance.h3
-rw-r--r--cpp/src/IceSSL/InstanceF.h3
-rw-r--r--cpp/src/IceSSL/Makefile.mk3
-rw-r--r--cpp/src/IceSSL/OpenSSLCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLEngineF.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.cpp3
-rw-r--r--cpp/src/IceSSL/OpenSSLUtil.h3
-rwxr-xr-xcpp/src/IceSSL/PluginI.cpp3
-rw-r--r--cpp/src/IceSSL/PluginI.h3
-rw-r--r--cpp/src/IceSSL/RFC2253.cpp3
-rw-r--r--cpp/src/IceSSL/RFC2253.h3
-rw-r--r--cpp/src/IceSSL/SChannelCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelEngine.h3
-rw-r--r--cpp/src/IceSSL/SChannelEngineF.h3
-rw-r--r--cpp/src/IceSSL/SChannelPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/SSLEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SSLEngine.h3
-rw-r--r--cpp/src/IceSSL/SSLEngineF.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportEngineF.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportTransceiverI.h3
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.cpp3
-rw-r--r--cpp/src/IceSSL/SecureTransportUtil.h3
-rw-r--r--cpp/src/IceSSL/TrustManager.cpp3
-rw-r--r--cpp/src/IceSSL/TrustManager.h3
-rw-r--r--cpp/src/IceSSL/TrustManagerF.h3
-rw-r--r--cpp/src/IceSSL/UWPCertificateI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPEngine.cpp3
-rw-r--r--cpp/src/IceSSL/UWPEngine.h3
-rw-r--r--cpp/src/IceSSL/UWPEngineF.h3
-rw-r--r--cpp/src/IceSSL/UWPPluginI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.cpp3
-rw-r--r--cpp/src/IceSSL/UWPTransceiverI.h3
-rwxr-xr-xcpp/src/IceSSL/Util.cpp3
-rw-r--r--cpp/src/IceSSL/Util.h3
-rw-r--r--cpp/src/IceStorm/Admin.cpp3
-rw-r--r--cpp/src/IceStorm/DBTypes.ice3
-rw-r--r--cpp/src/IceStorm/Election.ice3
-rw-r--r--cpp/src/IceStorm/Grammar.cpp3
-rw-r--r--cpp/src/IceStorm/Grammar.y3
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp3
-rw-r--r--cpp/src/IceStorm/IceStormInternal.ice3
-rw-r--r--cpp/src/IceStorm/Instance.cpp3
-rw-r--r--cpp/src/IceStorm/Instance.h3
-rw-r--r--cpp/src/IceStorm/Instrumentation.ice3
-rw-r--r--cpp/src/IceStorm/InstrumentationI.cpp3
-rw-r--r--cpp/src/IceStorm/InstrumentationI.h3
-rw-r--r--cpp/src/IceStorm/LLURecord.ice3
-rw-r--r--cpp/src/IceStorm/LinkRecord.ice3
-rw-r--r--cpp/src/IceStorm/Makefile.mk3
-rw-r--r--cpp/src/IceStorm/NodeI.cpp3
-rw-r--r--cpp/src/IceStorm/NodeI.h3
-rw-r--r--cpp/src/IceStorm/Observers.cpp3
-rw-r--r--cpp/src/IceStorm/Observers.h3
-rw-r--r--cpp/src/IceStorm/Parser.cpp3
-rw-r--r--cpp/src/IceStorm/Parser.h3
-rw-r--r--cpp/src/IceStorm/Replica.h3
-rw-r--r--cpp/src/IceStorm/Scanner.cpp3
-rw-r--r--cpp/src/IceStorm/Scanner.l3
-rw-r--r--cpp/src/IceStorm/Service.cpp3
-rw-r--r--cpp/src/IceStorm/Service.h3
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp3
-rw-r--r--cpp/src/IceStorm/Subscriber.h3
-rw-r--r--cpp/src/IceStorm/SubscriberRecord.ice3
-rw-r--r--cpp/src/IceStorm/TopicI.cpp3
-rw-r--r--cpp/src/IceStorm/TopicI.h3
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp3
-rw-r--r--cpp/src/IceStorm/TopicManagerI.h3
-rw-r--r--cpp/src/IceStorm/TraceLevels.cpp3
-rw-r--r--cpp/src/IceStorm/TraceLevels.h3
-rw-r--r--cpp/src/IceStorm/TransientTopicI.cpp3
-rw-r--r--cpp/src/IceStorm/TransientTopicI.h3
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.cpp3
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.h3
-rw-r--r--cpp/src/IceStorm/Util.cpp3
-rw-r--r--cpp/src/IceStorm/Util.h3
-rw-r--r--cpp/src/IceStormLib/Makefile.mk3
-rw-r--r--cpp/src/IceUtil/ConsoleUtil.cpp3
-rw-r--r--cpp/src/IceUtil/ConvertUTF.cpp3
-rw-r--r--cpp/src/IceUtil/ConvertUTF.h3
-rw-r--r--cpp/src/IceUtil/CtrlCHandler.cpp3
-rw-r--r--cpp/src/IceUtil/FileUtil.cpp3
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp3
-rw-r--r--cpp/src/IceUtil/Makefile.mk3
-rw-r--r--cpp/src/IceUtil/MutexProtocol.cpp3
-rw-r--r--cpp/src/IceUtil/Options.cpp3
-rw-r--r--cpp/src/IceUtil/OutputUtil.cpp3
-rw-r--r--cpp/src/IceUtil/Random.cpp3
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp3
-rw-r--r--cpp/src/IceUtil/Shared.cpp3
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp3
-rw-r--r--cpp/src/IceUtil/StringUtil.cpp3
-rw-r--r--cpp/src/IceUtil/ThreadException.cpp3
-rw-r--r--cpp/src/IceUtil/Time.cpp3
-rw-r--r--cpp/src/IceUtil/UUID.cpp3
-rw-r--r--cpp/src/IceUtil/Unicode.cpp3
-rw-r--r--cpp/src/IceUtil/Unicode.h3
-rw-r--r--cpp/src/IceUtil/UtilException.cpp3
-rw-r--r--cpp/src/IceXML/Makefile.mk3
-rw-r--r--cpp/src/IceXML/Parser.cpp3
-rw-r--r--cpp/src/IceXML/Parser.h3
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp6
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.h3
-rw-r--r--cpp/src/Slice/Checksum.cpp3
-rw-r--r--cpp/src/Slice/Checksum.h3
-rw-r--r--cpp/src/Slice/FileTracker.cpp3
-rw-r--r--cpp/src/Slice/FileTracker.h3
-rw-r--r--cpp/src/Slice/Grammar.cpp3
-rw-r--r--cpp/src/Slice/Grammar.y3
-rw-r--r--cpp/src/Slice/GrammarUtil.h3
-rw-r--r--cpp/src/Slice/JavaUtil.cpp6
-rw-r--r--cpp/src/Slice/JavaUtil.h3
-rw-r--r--cpp/src/Slice/MD5.cpp3
-rw-r--r--cpp/src/Slice/MD5.h3
-rw-r--r--cpp/src/Slice/Makefile.mk3
-rw-r--r--cpp/src/Slice/PHPUtil.cpp3
-rw-r--r--cpp/src/Slice/PHPUtil.h3
-rw-r--r--cpp/src/Slice/Parser.cpp3
-rw-r--r--cpp/src/Slice/Parser.h3
-rw-r--r--cpp/src/Slice/Preprocessor.cpp3
-rw-r--r--cpp/src/Slice/Preprocessor.h3
-rw-r--r--cpp/src/Slice/Python.cpp3
-rw-r--r--cpp/src/Slice/PythonUtil.cpp6
-rw-r--r--cpp/src/Slice/PythonUtil.h3
-rw-r--r--cpp/src/Slice/Ruby.cpp3
-rw-r--r--cpp/src/Slice/RubyUtil.cpp6
-rw-r--r--cpp/src/Slice/RubyUtil.h3
-rw-r--r--cpp/src/Slice/Scanner.cpp3
-rw-r--r--cpp/src/Slice/Scanner.l3
-rw-r--r--cpp/src/Slice/SliceUtil.cpp3
-rw-r--r--cpp/src/Slice/StringLiteralUtil.cpp3
-rw-r--r--cpp/src/Slice/Util.h3
-rw-r--r--cpp/src/icegriddb/DBTypes.ice3
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp3
-rw-r--r--cpp/src/icegriddb/Makefile.mk3
-rw-r--r--cpp/src/iceserviceinstall/Install.cpp3
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp3
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.h3
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.cpp3
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h3
-rw-r--r--cpp/src/slice2confluence/Gen.cpp3
-rw-r--r--cpp/src/slice2confluence/Gen.h3
-rw-r--r--cpp/src/slice2confluence/Main.cpp3
-rw-r--r--cpp/src/slice2cpp/Gen.cpp3
-rw-r--r--cpp/src/slice2cpp/Gen.h3
-rw-r--r--cpp/src/slice2cpp/Main.cpp3
-rw-r--r--cpp/src/slice2cs/CsUtil.cpp3
-rw-r--r--cpp/src/slice2cs/CsUtil.h3
-rw-r--r--cpp/src/slice2cs/DotNetNames.cpp3
-rw-r--r--cpp/src/slice2cs/DotNetNames.h3
-rw-r--r--cpp/src/slice2cs/Gen.cpp6
-rw-r--r--cpp/src/slice2cs/Gen.h3
-rw-r--r--cpp/src/slice2cs/Main.cpp3
-rw-r--r--cpp/src/slice2html/Gen.cpp3
-rw-r--r--cpp/src/slice2html/Gen.h3
-rw-r--r--cpp/src/slice2html/Main.cpp3
-rw-r--r--cpp/src/slice2java/Gen.cpp3
-rw-r--r--cpp/src/slice2java/Gen.h3
-rw-r--r--cpp/src/slice2java/GenCompat.cpp3
-rw-r--r--cpp/src/slice2java/GenCompat.h3
-rw-r--r--cpp/src/slice2java/Main.cpp3
-rw-r--r--cpp/src/slice2js/Gen.cpp6
-rw-r--r--cpp/src/slice2js/Gen.h3
-rw-r--r--cpp/src/slice2js/JsUtil.cpp3
-rw-r--r--cpp/src/slice2js/JsUtil.h3
-rw-r--r--cpp/src/slice2js/Main.cpp3
-rw-r--r--cpp/src/slice2matlab/Main.cpp3
-rw-r--r--cpp/src/slice2objc/Gen.cpp6
-rw-r--r--cpp/src/slice2objc/Gen.h3
-rw-r--r--cpp/src/slice2objc/Main.cpp3
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp3
-rw-r--r--cpp/src/slice2objc/ObjCUtil.h3
-rw-r--r--cpp/src/slice2php/Main.cpp6
-rw-r--r--cpp/src/slice2py/Main.cpp3
-rw-r--r--cpp/src/slice2rb/Main.cpp3
-rw-r--r--cpp/test/Common/Makefile.mk3
-rw-r--r--cpp/test/Common/TestHelper.cpp3
-rw-r--r--cpp/test/Glacier2/application/Callback.ice3
-rw-r--r--cpp/test/Glacier2/application/Client.cpp3
-rw-r--r--cpp/test/Glacier2/application/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/application/Server.cpp3
-rw-r--r--cpp/test/Glacier2/attack/Backend.ice3
-rw-r--r--cpp/test/Glacier2/attack/BackendI.cpp3
-rw-r--r--cpp/test/Glacier2/attack/BackendI.h3
-rw-r--r--cpp/test/Glacier2/attack/Client.cpp3
-rw-r--r--cpp/test/Glacier2/attack/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/attack/Server.cpp3
-rw-r--r--cpp/test/Glacier2/attack/test.py3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/BackendI.cpp3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/BackendI.h3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Client.cpp3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Server.cpp3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/SessionI.cpp3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/SessionI.h3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Test.ice3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/TestControllerI.h3
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/test.py3
-rw-r--r--cpp/test/Glacier2/hashpassword/test.py3
-rw-r--r--cpp/test/Glacier2/override/Callback.ice3
-rw-r--r--cpp/test/Glacier2/override/CallbackI.cpp3
-rw-r--r--cpp/test/Glacier2/override/CallbackI.h3
-rw-r--r--cpp/test/Glacier2/override/Client.cpp3
-rw-r--r--cpp/test/Glacier2/override/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/override/Server.cpp3
-rw-r--r--cpp/test/Glacier2/override/test.py3
-rw-r--r--cpp/test/Glacier2/router/Callback.ice3
-rw-r--r--cpp/test/Glacier2/router/CallbackI.cpp3
-rw-r--r--cpp/test/Glacier2/router/CallbackI.h3
-rw-r--r--cpp/test/Glacier2/router/Client.cpp3
-rw-r--r--cpp/test/Glacier2/router/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/router/Server.cpp3
-rw-r--r--cpp/test/Glacier2/sessionControl/Client.cpp3
-rw-r--r--cpp/test/Glacier2/sessionControl/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/sessionControl/Server.cpp3
-rw-r--r--cpp/test/Glacier2/sessionControl/Session.ice3
-rw-r--r--cpp/test/Glacier2/sessionControl/SessionI.cpp3
-rw-r--r--cpp/test/Glacier2/sessionControl/SessionI.h3
-rw-r--r--cpp/test/Glacier2/sessionControl/test.py3
-rw-r--r--cpp/test/Glacier2/sessionHelper/Callback.ice3
-rw-r--r--cpp/test/Glacier2/sessionHelper/Client.cpp3
-rw-r--r--cpp/test/Glacier2/sessionHelper/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/sessionHelper/Server.cpp3
-rw-r--r--cpp/test/Glacier2/ssl/Client.cpp3
-rw-r--r--cpp/test/Glacier2/ssl/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/ssl/Server.cpp3
-rw-r--r--cpp/test/Glacier2/ssl/test.py3
-rw-r--r--cpp/test/Glacier2/staticFiltering/Backend.ice3
-rw-r--r--cpp/test/Glacier2/staticFiltering/BackendI.cpp3
-rw-r--r--cpp/test/Glacier2/staticFiltering/BackendI.h3
-rw-r--r--cpp/test/Glacier2/staticFiltering/Client.cpp3
-rw-r--r--cpp/test/Glacier2/staticFiltering/Makefile.mk3
-rw-r--r--cpp/test/Glacier2/staticFiltering/Server.cpp3
-rw-r--r--cpp/test/Glacier2/staticFiltering/test.py3
-rw-r--r--cpp/test/Ice/acm/AllTests.cpp3
-rw-r--r--cpp/test/Ice/acm/Client.cpp3
-rw-r--r--cpp/test/Ice/acm/Server.cpp3
-rw-r--r--cpp/test/Ice/acm/Test.ice3
-rw-r--r--cpp/test/Ice/acm/TestI.cpp3
-rw-r--r--cpp/test/Ice/acm/TestI.h3
-rw-r--r--cpp/test/Ice/adapterDeactivation/AllTests.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/Client.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/Collocated.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/Makefile.mk3
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.h3
-rw-r--r--cpp/test/Ice/adapterDeactivation/Server.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/Test.ice3
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.cpp3
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.h3
-rw-r--r--cpp/test/Ice/admin/AllTests.cpp3
-rw-r--r--cpp/test/Ice/admin/Client.cpp3
-rw-r--r--cpp/test/Ice/admin/Server.cpp3
-rw-r--r--cpp/test/Ice/admin/Test.ice3
-rw-r--r--cpp/test/Ice/admin/TestI.cpp3
-rw-r--r--cpp/test/Ice/admin/TestI.h3
-rw-r--r--cpp/test/Ice/ami/AllTests.cpp3
-rw-r--r--cpp/test/Ice/ami/Client.cpp3
-rw-r--r--cpp/test/Ice/ami/Collocated.cpp3
-rw-r--r--cpp/test/Ice/ami/Server.cpp3
-rw-r--r--cpp/test/Ice/ami/Test.ice3
-rw-r--r--cpp/test/Ice/ami/TestI.cpp3
-rw-r--r--cpp/test/Ice/ami/TestI.h3
-rw-r--r--cpp/test/Ice/background/Acceptor.cpp3
-rw-r--r--cpp/test/Ice/background/Acceptor.h3
-rw-r--r--cpp/test/Ice/background/AllTests.cpp3
-rw-r--r--cpp/test/Ice/background/Client.cpp3
-rw-r--r--cpp/test/Ice/background/Configuration.cpp3
-rw-r--r--cpp/test/Ice/background/Configuration.h3
-rw-r--r--cpp/test/Ice/background/Connector.cpp3
-rw-r--r--cpp/test/Ice/background/Connector.h3
-rw-r--r--cpp/test/Ice/background/EndpointFactory.cpp3
-rw-r--r--cpp/test/Ice/background/EndpointFactory.h3
-rw-r--r--cpp/test/Ice/background/EndpointI.cpp3
-rw-r--r--cpp/test/Ice/background/EndpointI.h3
-rw-r--r--cpp/test/Ice/background/Makefile.mk3
-rw-r--r--cpp/test/Ice/background/PluginI.cpp3
-rw-r--r--cpp/test/Ice/background/PluginI.h3
-rw-r--r--cpp/test/Ice/background/Server.cpp3
-rw-r--r--cpp/test/Ice/background/Test.ice3
-rw-r--r--cpp/test/Ice/background/TestI.cpp3
-rw-r--r--cpp/test/Ice/background/TestI.h3
-rw-r--r--cpp/test/Ice/background/Transceiver.cpp3
-rw-r--r--cpp/test/Ice/background/Transceiver.h3
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp3
-rw-r--r--cpp/test/Ice/binding/Client.cpp3
-rw-r--r--cpp/test/Ice/binding/Server.cpp3
-rw-r--r--cpp/test/Ice/binding/Test.ice3
-rw-r--r--cpp/test/Ice/binding/TestI.cpp3
-rw-r--r--cpp/test/Ice/binding/TestI.h3
-rw-r--r--cpp/test/Ice/checksum/AllTests.cpp3
-rw-r--r--cpp/test/Ice/checksum/Client.cpp3
-rw-r--r--cpp/test/Ice/checksum/ClientTypes.ice3
-rw-r--r--cpp/test/Ice/checksum/Makefile.mk3
-rw-r--r--cpp/test/Ice/checksum/Server.cpp3
-rw-r--r--cpp/test/Ice/checksum/ServerTypes.ice3
-rw-r--r--cpp/test/Ice/checksum/Test.ice3
-rw-r--r--cpp/test/Ice/checksum/TestI.cpp3
-rw-r--r--cpp/test/Ice/checksum/TestI.h3
-rw-r--r--cpp/test/Ice/custom/AllTests.cpp3
-rw-r--r--cpp/test/Ice/custom/Client.cpp3
-rw-r--r--cpp/test/Ice/custom/Collocated.cpp3
-rw-r--r--cpp/test/Ice/custom/CustomBuffer.h3
-rw-r--r--cpp/test/Ice/custom/CustomMap.h3
-rw-r--r--cpp/test/Ice/custom/Makefile.mk3
-rw-r--r--cpp/test/Ice/custom/MyByteSeq.cpp3
-rw-r--r--cpp/test/Ice/custom/MyByteSeq.h3
-rw-r--r--cpp/test/Ice/custom/Server.cpp3
-rw-r--r--cpp/test/Ice/custom/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/custom/StringConverterI.cpp3
-rw-r--r--cpp/test/Ice/custom/StringConverterI.h3
-rw-r--r--cpp/test/Ice/custom/StringView.h3
-rw-r--r--cpp/test/Ice/custom/Test.ice3
-rw-r--r--cpp/test/Ice/custom/TestAMD.ice3
-rw-r--r--cpp/test/Ice/custom/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/custom/TestAMDI.h3
-rw-r--r--cpp/test/Ice/custom/TestI.cpp3
-rw-r--r--cpp/test/Ice/custom/TestI.h3
-rw-r--r--cpp/test/Ice/custom/Wstring.ice3
-rw-r--r--cpp/test/Ice/custom/WstringAMD.ice3
-rw-r--r--cpp/test/Ice/custom/WstringAMDI.cpp3
-rw-r--r--cpp/test/Ice/custom/WstringAMDI.h3
-rw-r--r--cpp/test/Ice/custom/WstringI.cpp3
-rw-r--r--cpp/test/Ice/custom/WstringI.h3
-rw-r--r--cpp/test/Ice/defaultServant/AllTests.cpp3
-rw-r--r--cpp/test/Ice/defaultServant/Client.cpp3
-rw-r--r--cpp/test/Ice/defaultServant/Makefile.mk3
-rw-r--r--cpp/test/Ice/defaultServant/Test.ice3
-rw-r--r--cpp/test/Ice/defaultServant/TestI.cpp3
-rw-r--r--cpp/test/Ice/defaultServant/TestI.h3
-rw-r--r--cpp/test/Ice/defaultValue/AllTests.cpp3
-rw-r--r--cpp/test/Ice/defaultValue/Client.cpp3
-rw-r--r--cpp/test/Ice/defaultValue/Test.ice3
-rw-r--r--cpp/test/Ice/dispatcher/AllTests.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/Client.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/Collocated.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/Dispatcher.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/Dispatcher.h3
-rw-r--r--cpp/test/Ice/dispatcher/Makefile.mk3
-rw-r--r--cpp/test/Ice/dispatcher/Server.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/Test.ice3
-rw-r--r--cpp/test/Ice/dispatcher/TestI.cpp3
-rw-r--r--cpp/test/Ice/dispatcher/TestI.h3
-rw-r--r--cpp/test/Ice/echo/BlobjectI.cpp3
-rw-r--r--cpp/test/Ice/echo/BlobjectI.h3
-rw-r--r--cpp/test/Ice/echo/Makefile.mk3
-rw-r--r--cpp/test/Ice/echo/Server.cpp3
-rw-r--r--cpp/test/Ice/echo/Test.ice3
-rw-r--r--cpp/test/Ice/echo/test.py3
-rw-r--r--cpp/test/Ice/enums/AllTests.cpp3
-rw-r--r--cpp/test/Ice/enums/Client.cpp3
-rw-r--r--cpp/test/Ice/enums/Server.cpp3
-rw-r--r--cpp/test/Ice/enums/Test.ice3
-rw-r--r--cpp/test/Ice/enums/TestI.cpp3
-rw-r--r--cpp/test/Ice/enums/TestI.h3
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp3
-rw-r--r--cpp/test/Ice/exceptions/Client.cpp3
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp3
-rw-r--r--cpp/test/Ice/exceptions/ExceptionsI.cpp3
-rw-r--r--cpp/test/Ice/exceptions/Makefile.mk3
-rw-r--r--cpp/test/Ice/exceptions/Server.cpp3
-rw-r--r--cpp/test/Ice/exceptions/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/exceptions/Test.ice3
-rw-r--r--cpp/test/Ice/exceptions/TestAMD.ice3
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.h3
-rw-r--r--cpp/test/Ice/exceptions/TestI.cpp3
-rw-r--r--cpp/test/Ice/exceptions/TestI.h3
-rw-r--r--cpp/test/Ice/facets/AllTests.cpp3
-rw-r--r--cpp/test/Ice/facets/Client.cpp3
-rw-r--r--cpp/test/Ice/facets/Collocated.cpp3
-rw-r--r--cpp/test/Ice/facets/Server.cpp3
-rw-r--r--cpp/test/Ice/facets/Test.ice3
-rw-r--r--cpp/test/Ice/facets/TestI.cpp3
-rw-r--r--cpp/test/Ice/facets/TestI.h3
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp3
-rw-r--r--cpp/test/Ice/faultTolerance/Client.cpp3
-rw-r--r--cpp/test/Ice/faultTolerance/Server.cpp3
-rw-r--r--cpp/test/Ice/faultTolerance/Test.ice3
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp3
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.h3
-rw-r--r--cpp/test/Ice/gc/Client.cpp3
-rw-r--r--cpp/test/Ice/gc/Test.ice3
-rw-r--r--cpp/test/Ice/gc/test.py3
-rw-r--r--cpp/test/Ice/hash/Client.cpp3
-rw-r--r--cpp/test/Ice/hash/Test.ice3
-rw-r--r--cpp/test/Ice/hold/AllTests.cpp3
-rw-r--r--cpp/test/Ice/hold/Client.cpp3
-rw-r--r--cpp/test/Ice/hold/Server.cpp3
-rw-r--r--cpp/test/Ice/hold/Test.ice3
-rw-r--r--cpp/test/Ice/hold/TestI.cpp3
-rw-r--r--cpp/test/Ice/hold/TestI.h3
-rw-r--r--cpp/test/Ice/impl/Makefile.mk3
-rw-r--r--cpp/test/Ice/impl/Server.cpp3
-rw-r--r--cpp/test/Ice/impl/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/impl/Test.ice3
-rw-r--r--cpp/test/Ice/impl/TestAMD.ice3
-rw-r--r--cpp/test/Ice/info/AllTests.cpp3
-rw-r--r--cpp/test/Ice/info/Client.cpp3
-rw-r--r--cpp/test/Ice/info/Makefile.mk3
-rw-r--r--cpp/test/Ice/info/Server.cpp3
-rw-r--r--cpp/test/Ice/info/Test.ice3
-rw-r--r--cpp/test/Ice/info/TestI.cpp3
-rw-r--r--cpp/test/Ice/info/TestI.h3
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp3
-rw-r--r--cpp/test/Ice/inheritance/Client.cpp3
-rw-r--r--cpp/test/Ice/inheritance/Collocated.cpp3
-rw-r--r--cpp/test/Ice/inheritance/Server.cpp3
-rw-r--r--cpp/test/Ice/inheritance/Test.ice3
-rw-r--r--cpp/test/Ice/inheritance/TestI.cpp3
-rw-r--r--cpp/test/Ice/inheritance/TestI.h3
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.cpp3
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.h3
-rw-r--r--cpp/test/Ice/interceptor/Client.cpp3
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.cpp3
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.h3
-rw-r--r--cpp/test/Ice/interceptor/Makefile.mk3
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.cpp3
-rw-r--r--cpp/test/Ice/interceptor/MyObjectI.h3
-rw-r--r--cpp/test/Ice/interceptor/Test.ice3
-rw-r--r--cpp/test/Ice/interceptor/TestI.cpp3
-rw-r--r--cpp/test/Ice/invoke/AllTests.cpp3
-rw-r--r--cpp/test/Ice/invoke/BlobjectI.cpp3
-rw-r--r--cpp/test/Ice/invoke/BlobjectI.h3
-rw-r--r--cpp/test/Ice/invoke/Client.cpp3
-rw-r--r--cpp/test/Ice/invoke/Makefile.mk3
-rw-r--r--cpp/test/Ice/invoke/Server.cpp3
-rw-r--r--cpp/test/Ice/invoke/Test.ice3
-rw-r--r--cpp/test/Ice/library/AllTests.cpp3
-rw-r--r--cpp/test/Ice/library/Client.cpp3
-rw-r--r--cpp/test/Ice/library/Consumer.cpp3
-rw-r--r--cpp/test/Ice/library/Makefile.mk3
-rw-r--r--cpp/test/Ice/library/Test.ice3
-rw-r--r--cpp/test/Ice/library/test.py3
-rw-r--r--cpp/test/Ice/location/AllTests.cpp3
-rw-r--r--cpp/test/Ice/location/Client.cpp3
-rw-r--r--cpp/test/Ice/location/Makefile.mk3
-rw-r--r--cpp/test/Ice/location/Server.cpp3
-rw-r--r--cpp/test/Ice/location/ServerLocator.cpp3
-rw-r--r--cpp/test/Ice/location/ServerLocator.h3
-rw-r--r--cpp/test/Ice/location/Test.ice3
-rw-r--r--cpp/test/Ice/location/TestI.cpp3
-rw-r--r--cpp/test/Ice/location/TestI.h3
-rw-r--r--cpp/test/Ice/logger/Client1.cpp3
-rw-r--r--cpp/test/Ice/logger/Client2.cpp3
-rw-r--r--cpp/test/Ice/logger/Client3.cpp3
-rw-r--r--cpp/test/Ice/logger/Client4.cpp3
-rw-r--r--cpp/test/Ice/logger/Client5.cpp3
-rw-r--r--cpp/test/Ice/logger/Makefile.mk3
-rw-r--r--cpp/test/Ice/logger/test.py3
-rw-r--r--cpp/test/Ice/metrics/AllTests.cpp3
-rw-r--r--cpp/test/Ice/metrics/Client.cpp3
-rw-r--r--cpp/test/Ice/metrics/Collocated.cpp3
-rw-r--r--cpp/test/Ice/metrics/InstrumentationI.h3
-rw-r--r--cpp/test/Ice/metrics/Server.cpp3
-rw-r--r--cpp/test/Ice/metrics/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/metrics/Test.ice3
-rw-r--r--cpp/test/Ice/metrics/TestAMD.ice3
-rw-r--r--cpp/test/Ice/metrics/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/metrics/TestAMDI.h3
-rw-r--r--cpp/test/Ice/metrics/TestI.cpp3
-rw-r--r--cpp/test/Ice/metrics/TestI.h3
-rw-r--r--cpp/test/Ice/networkProxy/AllTests.cpp3
-rw-r--r--cpp/test/Ice/networkProxy/Client.cpp3
-rw-r--r--cpp/test/Ice/networkProxy/Server.cpp3
-rw-r--r--cpp/test/Ice/networkProxy/Test.ice3
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp3
-rw-r--r--cpp/test/Ice/objects/Client.cpp3
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp3
-rw-r--r--cpp/test/Ice/objects/Derived.ice3
-rw-r--r--cpp/test/Ice/objects/DerivedEx.ice3
-rw-r--r--cpp/test/Ice/objects/Makefile.mk3
-rw-r--r--cpp/test/Ice/objects/Server.cpp3
-rw-r--r--cpp/test/Ice/objects/Test.ice3
-rw-r--r--cpp/test/Ice/objects/TestI.cpp3
-rw-r--r--cpp/test/Ice/objects/TestI.h3
-rw-r--r--cpp/test/Ice/objects/TestIntfI.cpp3
-rw-r--r--cpp/test/Ice/operations/AllTests.cpp3
-rw-r--r--cpp/test/Ice/operations/BatchOneways.cpp3
-rw-r--r--cpp/test/Ice/operations/BatchOnewaysAMI.cpp3
-rw-r--r--cpp/test/Ice/operations/Client.cpp3
-rw-r--r--cpp/test/Ice/operations/Collocated.cpp3
-rw-r--r--cpp/test/Ice/operations/Makefile.mk3
-rw-r--r--cpp/test/Ice/operations/Oneways.cpp3
-rw-r--r--cpp/test/Ice/operations/OnewaysAMI.cpp3
-rw-r--r--cpp/test/Ice/operations/Server.cpp3
-rw-r--r--cpp/test/Ice/operations/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/operations/Test.ice3
-rw-r--r--cpp/test/Ice/operations/TestAMD.ice3
-rw-r--r--cpp/test/Ice/operations/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/operations/TestAMDI.h3
-rw-r--r--cpp/test/Ice/operations/TestI.cpp3
-rw-r--r--cpp/test/Ice/operations/TestI.h3
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp3
-rw-r--r--cpp/test/Ice/operations/TwowaysAMI.cpp3
-rw-r--r--cpp/test/Ice/optional/AllTests.cpp3
-rw-r--r--cpp/test/Ice/optional/Client.cpp3
-rw-r--r--cpp/test/Ice/optional/CustomMap.h3
-rw-r--r--cpp/test/Ice/optional/Server.cpp3
-rw-r--r--cpp/test/Ice/optional/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/optional/StringView.h3
-rw-r--r--cpp/test/Ice/optional/Test.ice3
-rw-r--r--cpp/test/Ice/optional/TestAMD.ice3
-rw-r--r--cpp/test/Ice/optional/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/optional/TestAMDI.h3
-rw-r--r--cpp/test/Ice/optional/TestI.cpp3
-rw-r--r--cpp/test/Ice/optional/TestI.h3
-rw-r--r--cpp/test/Ice/plugin/Client.cpp3
-rw-r--r--cpp/test/Ice/plugin/Makefile.mk3
-rw-r--r--cpp/test/Ice/plugin/Plugin.cpp3
-rw-r--r--cpp/test/Ice/plugin/test.py3
-rw-r--r--cpp/test/Ice/properties/Client.cpp3
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp3
-rw-r--r--cpp/test/Ice/proxy/Client.cpp3
-rw-r--r--cpp/test/Ice/proxy/Collocated.cpp3
-rw-r--r--cpp/test/Ice/proxy/Server.cpp3
-rw-r--r--cpp/test/Ice/proxy/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/proxy/Test.ice3
-rw-r--r--cpp/test/Ice/proxy/TestAMD.ice3
-rw-r--r--cpp/test/Ice/proxy/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/proxy/TestAMDI.h3
-rw-r--r--cpp/test/Ice/proxy/TestI.cpp3
-rw-r--r--cpp/test/Ice/proxy/TestI.h3
-rw-r--r--cpp/test/Ice/retry/AllTests.cpp3
-rw-r--r--cpp/test/Ice/retry/Client.cpp3
-rw-r--r--cpp/test/Ice/retry/Collocated.cpp3
-rw-r--r--cpp/test/Ice/retry/InstrumentationI.cpp3
-rw-r--r--cpp/test/Ice/retry/InstrumentationI.h3
-rw-r--r--cpp/test/Ice/retry/Makefile.mk3
-rw-r--r--cpp/test/Ice/retry/Server.cpp3
-rw-r--r--cpp/test/Ice/retry/SystemFailure.h3
-rw-r--r--cpp/test/Ice/retry/Test.ice3
-rw-r--r--cpp/test/Ice/retry/TestI.cpp3
-rw-r--r--cpp/test/Ice/retry/TestI.h3
-rw-r--r--cpp/test/Ice/scope/AllTests.cpp3
-rw-r--r--cpp/test/Ice/scope/Client.cpp3
-rw-r--r--cpp/test/Ice/scope/Server.cpp3
-rw-r--r--cpp/test/Ice/scope/Test.ice3
-rw-r--r--cpp/test/Ice/servantLocator/AllTests.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/Client.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/Collocated.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/Makefile.mk3
-rw-r--r--cpp/test/Ice/servantLocator/ServantLocatorI.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/ServantLocatorI.h3
-rw-r--r--cpp/test/Ice/servantLocator/Server.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/Test.ice3
-rw-r--r--cpp/test/Ice/servantLocator/TestAMD.ice3
-rw-r--r--cpp/test/Ice/servantLocator/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/TestAMDI.h3
-rw-r--r--cpp/test/Ice/servantLocator/TestI.cpp3
-rw-r--r--cpp/test/Ice/servantLocator/TestI.h3
-rw-r--r--cpp/test/Ice/services/AllTests.cpp3
-rw-r--r--cpp/test/Ice/services/Client.cpp3
-rw-r--r--cpp/test/Ice/services/Makefile.mk3
-rw-r--r--cpp/test/Ice/services/Test.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/AllTests.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/Client.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/ClientPrivate.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/Makefile.mk3
-rw-r--r--cpp/test/Ice/slicing/exceptions/Server.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivate.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/Test.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMD.ice3
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.h3
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.cpp3
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.h3
-rw-r--r--cpp/test/Ice/slicing/objects/AllTests.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/Client.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/ClientPrivate.ice3
-rw-r--r--cpp/test/Ice/slicing/objects/Makefile.mk3
-rw-r--r--cpp/test/Ice/slicing/objects/Server.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/ServerAMD.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivate.ice3
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice3
-rw-r--r--cpp/test/Ice/slicing/objects/Test.ice3
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMD.ice3
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.h3
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.cpp3
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.h3
-rw-r--r--cpp/test/Ice/stream/Client.cpp3
-rw-r--r--cpp/test/Ice/stream/Test.ice3
-rw-r--r--cpp/test/Ice/stringConverter/Client.cpp3
-rw-r--r--cpp/test/Ice/stringConverter/Makefile.mk3
-rw-r--r--cpp/test/Ice/stringConverter/Server.cpp3
-rw-r--r--cpp/test/Ice/stringConverter/Test.ice3
-rw-r--r--cpp/test/Ice/threadPoolPriority/AllTests.cpp3
-rw-r--r--cpp/test/Ice/threadPoolPriority/Client.cpp3
-rw-r--r--cpp/test/Ice/threadPoolPriority/Makefile.mk3
-rw-r--r--cpp/test/Ice/threadPoolPriority/Server.cpp3
-rw-r--r--cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp3
-rw-r--r--cpp/test/Ice/threadPoolPriority/Test.ice3
-rw-r--r--cpp/test/Ice/threadPoolPriority/TestI.cpp3
-rw-r--r--cpp/test/Ice/threadPoolPriority/TestI.h3
-rw-r--r--cpp/test/Ice/threadPoolPriority/test.py3
-rw-r--r--cpp/test/Ice/timeout/AllTests.cpp3
-rw-r--r--cpp/test/Ice/timeout/Client.cpp3
-rw-r--r--cpp/test/Ice/timeout/Makefile.mk3
-rw-r--r--cpp/test/Ice/timeout/Server.cpp3
-rw-r--r--cpp/test/Ice/timeout/Test.ice3
-rw-r--r--cpp/test/Ice/timeout/TestI.cpp3
-rw-r--r--cpp/test/Ice/timeout/TestI.h3
-rw-r--r--cpp/test/Ice/udp/AllTests.cpp3
-rw-r--r--cpp/test/Ice/udp/Client.cpp3
-rw-r--r--cpp/test/Ice/udp/Server.cpp3
-rw-r--r--cpp/test/Ice/udp/Test.ice3
-rw-r--r--cpp/test/Ice/udp/TestI.cpp3
-rw-r--r--cpp/test/Ice/udp/TestI.h3
-rw-r--r--cpp/test/IceBox/admin/AllTests.cpp3
-rw-r--r--cpp/test/IceBox/admin/Client.cpp3
-rw-r--r--cpp/test/IceBox/admin/Makefile.mk3
-rw-r--r--cpp/test/IceBox/admin/Service.cpp3
-rw-r--r--cpp/test/IceBox/admin/Test.ice3
-rw-r--r--cpp/test/IceBox/admin/TestI.cpp3
-rw-r--r--cpp/test/IceBox/admin/TestI.h3
-rw-r--r--cpp/test/IceBox/configuration/AllTests.cpp3
-rw-r--r--cpp/test/IceBox/configuration/Client.cpp3
-rw-r--r--cpp/test/IceBox/configuration/Makefile.mk3
-rw-r--r--cpp/test/IceBox/configuration/Service.cpp3
-rw-r--r--cpp/test/IceBox/configuration/Test.ice3
-rw-r--r--cpp/test/IceBox/configuration/TestI.cpp3
-rw-r--r--cpp/test/IceBox/configuration/TestI.h3
-rw-r--r--cpp/test/IceBridge/simple/AllTests.cpp3
-rw-r--r--cpp/test/IceBridge/simple/Client.cpp3
-rw-r--r--cpp/test/IceBridge/simple/Server.cpp3
-rw-r--r--cpp/test/IceBridge/simple/Test.ice3
-rw-r--r--cpp/test/IceBridge/simple/TestI.cpp3
-rw-r--r--cpp/test/IceBridge/simple/TestI.h3
-rw-r--r--cpp/test/IceBridge/simple/test.py3
-rw-r--r--cpp/test/IceDiscovery/simple/AllTests.cpp3
-rw-r--r--cpp/test/IceDiscovery/simple/Client.cpp3
-rw-r--r--cpp/test/IceDiscovery/simple/Makefile.mk3
-rw-r--r--cpp/test/IceDiscovery/simple/Server.cpp3
-rw-r--r--cpp/test/IceDiscovery/simple/Test.ice3
-rw-r--r--cpp/test/IceDiscovery/simple/TestI.cpp3
-rw-r--r--cpp/test/IceDiscovery/simple/TestI.h3
-rw-r--r--cpp/test/IceGrid/activation/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/activation/Client.cpp3
-rw-r--r--cpp/test/IceGrid/activation/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/activation/Server.cpp3
-rw-r--r--cpp/test/IceGrid/activation/Test.ice3
-rw-r--r--cpp/test/IceGrid/activation/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/activation/TestI.h3
-rw-r--r--cpp/test/IceGrid/activation/test.py3
-rw-r--r--cpp/test/IceGrid/admin/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/admin/Server.cpp3
-rw-r--r--cpp/test/IceGrid/admin/test.py3
-rw-r--r--cpp/test/IceGrid/allocation/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/allocation/Client.cpp3
-rw-r--r--cpp/test/IceGrid/allocation/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/allocation/PermissionsVerifier.cpp3
-rw-r--r--cpp/test/IceGrid/allocation/Server.cpp3
-rw-r--r--cpp/test/IceGrid/allocation/Test.ice3
-rw-r--r--cpp/test/IceGrid/allocation/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/allocation/TestI.h3
-rw-r--r--cpp/test/IceGrid/allocation/test.py3
-rw-r--r--cpp/test/IceGrid/deployer/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/deployer/Client.cpp3
-rw-r--r--cpp/test/IceGrid/deployer/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/deployer/Server.cpp3
-rw-r--r--cpp/test/IceGrid/deployer/Service.cpp3
-rw-r--r--cpp/test/IceGrid/deployer/Test.ice3
-rw-r--r--cpp/test/IceGrid/deployer/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/deployer/TestI.h3
-rw-r--r--cpp/test/IceGrid/deployer/test.py3
-rw-r--r--cpp/test/IceGrid/distribution/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/distribution/Client.cpp3
-rw-r--r--cpp/test/IceGrid/distribution/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/distribution/Server.cpp3
-rw-r--r--cpp/test/IceGrid/distribution/Test.ice3
-rw-r--r--cpp/test/IceGrid/distribution/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/distribution/TestI.h3
-rw-r--r--cpp/test/IceGrid/distribution/test.py3
-rw-r--r--cpp/test/IceGrid/fileLock/test.py3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Client.cpp3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Server.cpp3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Service.cpp3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/Test.ice3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/TestI.h3
-rw-r--r--cpp/test/IceGrid/noRestartUpdate/test.py3
-rw-r--r--cpp/test/IceGrid/replicaGroup/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/Client.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/Server.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/Service.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/Test.ice3
-rw-r--r--cpp/test/IceGrid/replicaGroup/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/replicaGroup/TestI.h3
-rw-r--r--cpp/test/IceGrid/replicaGroup/test.py3
-rw-r--r--cpp/test/IceGrid/replication/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/replication/Client.cpp3
-rw-r--r--cpp/test/IceGrid/replication/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/replication/Server.cpp3
-rw-r--r--cpp/test/IceGrid/replication/Test.ice3
-rw-r--r--cpp/test/IceGrid/replication/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/replication/TestI.h3
-rw-r--r--cpp/test/IceGrid/replication/test.py3
-rw-r--r--cpp/test/IceGrid/session/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/session/Client.cpp3
-rw-r--r--cpp/test/IceGrid/session/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/session/PermissionsVerifier.cpp3
-rw-r--r--cpp/test/IceGrid/session/Server.cpp3
-rw-r--r--cpp/test/IceGrid/session/Test.ice3
-rw-r--r--cpp/test/IceGrid/session/test.py3
-rw-r--r--cpp/test/IceGrid/simple/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/simple/Client.cpp3
-rw-r--r--cpp/test/IceGrid/simple/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/simple/Server.cpp3
-rw-r--r--cpp/test/IceGrid/simple/Test.ice3
-rw-r--r--cpp/test/IceGrid/simple/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/simple/TestI.h3
-rw-r--r--cpp/test/IceGrid/update/AllTests.cpp3
-rw-r--r--cpp/test/IceGrid/update/Client.cpp3
-rw-r--r--cpp/test/IceGrid/update/Makefile.mk3
-rw-r--r--cpp/test/IceGrid/update/Server.cpp3
-rw-r--r--cpp/test/IceGrid/update/Test.ice3
-rw-r--r--cpp/test/IceGrid/update/TestI.cpp3
-rw-r--r--cpp/test/IceGrid/update/TestI.h3
-rw-r--r--cpp/test/IceGrid/update/test.py3
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp3
-rw-r--r--cpp/test/IceSSL/configuration/Client.cpp3
-rw-r--r--cpp/test/IceSSL/configuration/Makefile.mk3
-rw-r--r--cpp/test/IceSSL/configuration/Server.cpp3
-rw-r--r--cpp/test/IceSSL/configuration/Test.ice3
-rw-r--r--cpp/test/IceSSL/configuration/TestI.cpp3
-rw-r--r--cpp/test/IceSSL/configuration/TestI.h3
-rw-r--r--cpp/test/IceStorm/federation/Event.ice3
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/federation/test.py3
-rw-r--r--cpp/test/IceStorm/federation2/Event.ice3
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/federation2/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/federation2/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/federation2/test.py3
-rw-r--r--cpp/test/IceStorm/persistent/Client.cpp3
-rw-r--r--cpp/test/IceStorm/persistent/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/persistent/test.py3
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/rep1/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/rep1/Single.ice3
-rw-r--r--cpp/test/IceStorm/rep1/Sub.cpp3
-rw-r--r--cpp/test/IceStorm/rep1/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/rep1/test.py3
-rw-r--r--cpp/test/IceStorm/repgrid/Client.cpp3
-rw-r--r--cpp/test/IceStorm/repgrid/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/repgrid/Single.ice3
-rw-r--r--cpp/test/IceStorm/repgrid/application.xml3
-rw-r--r--cpp/test/IceStorm/repgrid/test.py3
-rw-r--r--cpp/test/IceStorm/repstress/Control.cpp3
-rw-r--r--cpp/test/IceStorm/repstress/Controller.ice3
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/repstress/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/repstress/Single.ice3
-rw-r--r--cpp/test/IceStorm/repstress/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/repstress/test.py3
-rw-r--r--cpp/test/IceStorm/single/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/single/Single.ice3
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/single/test.py3
-rw-r--r--cpp/test/IceStorm/stress/Event.ice3
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mk3
-rw-r--r--cpp/test/IceStorm/stress/Publisher.cpp3
-rw-r--r--cpp/test/IceStorm/stress/Subscriber.cpp3
-rw-r--r--cpp/test/IceStorm/stress/test.py3
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Client.cpp3
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Makefile.mk3
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/test.py3
-rw-r--r--cpp/test/IceUtil/inputUtil/Client.cpp3
-rw-r--r--cpp/test/IceUtil/priority/Client.cpp3
-rw-r--r--cpp/test/IceUtil/priority/Makefile.mk3
-rw-r--r--cpp/test/IceUtil/priority/PriorityInversion.cpp3
-rw-r--r--cpp/test/IceUtil/priority/PriorityInversion.h3
-rw-r--r--cpp/test/IceUtil/priority/TestBase.cpp3
-rw-r--r--cpp/test/IceUtil/priority/TestBase.h3
-rw-r--r--cpp/test/IceUtil/priority/TestSuite.cpp3
-rw-r--r--cpp/test/IceUtil/priority/TestSuite.h3
-rw-r--r--cpp/test/IceUtil/priority/ThreadPriority.cpp3
-rw-r--r--cpp/test/IceUtil/priority/ThreadPriority.h3
-rw-r--r--cpp/test/IceUtil/priority/TimerPriority.cpp3
-rw-r--r--cpp/test/IceUtil/priority/TimerPriority.h3
-rw-r--r--cpp/test/IceUtil/priority/test.py3
-rw-r--r--cpp/test/IceUtil/sha1/Client.cpp3
-rw-r--r--cpp/test/IceUtil/stacktrace/Client.cpp3
-rw-r--r--cpp/test/IceUtil/stacktrace/test.py3
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.h3
-rw-r--r--cpp/test/IceUtil/thread/Client.cpp3
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.h3
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.h3
-rw-r--r--cpp/test/IceUtil/thread/Makefile.mk3
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.h3
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.h3
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.h3
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.h3
-rw-r--r--cpp/test/IceUtil/thread/SleepTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/SleepTest.h3
-rw-r--r--cpp/test/IceUtil/thread/StartTest.cpp3
-rw-r--r--cpp/test/IceUtil/thread/StartTest.h3
-rw-r--r--cpp/test/IceUtil/thread/TestBase.cpp3
-rw-r--r--cpp/test/IceUtil/thread/TestBase.h3
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.cpp3
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.h3
-rw-r--r--cpp/test/IceUtil/timer/Client.cpp3
-rw-r--r--cpp/test/IceUtil/unicode/Client.cpp3
-rw-r--r--cpp/test/IceUtil/unicode/test.py3
-rw-r--r--cpp/test/IceUtil/uuid/Client.cpp3
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice3
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice3
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.ice3
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.ice3
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.ice3
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorDuplication.ice3
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorValues.ice3
-rw-r--r--cpp/test/Slice/errorDetection/ExceptionRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalIdentifier.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice3
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice3
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.ice3
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.ice3
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice3
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.ice3
-rw-r--r--cpp/test/Slice/errorDetection/NotException.ice3
-rw-r--r--cpp/test/Slice/errorDetection/NotType.ice3
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/OptionalMembers.ice3
-rw-r--r--cpp/test/Slice/errorDetection/OptionalParams.ice3
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice3
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice3
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice3
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice3
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice3
-rw-r--r--cpp/test/Slice/errorDetection/StructRedefinition.ice3
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.ice3
-rw-r--r--cpp/test/Slice/errorDetection/WarningClassProxy.ice3
-rw-r--r--cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice3
-rw-r--r--cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice3
-rw-r--r--cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice3
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.ice3
-rw-r--r--cpp/test/Slice/errorDetection/include/IcePrefix.ice3
-rw-r--r--cpp/test/Slice/errorDetection/test.py3
-rw-r--r--cpp/test/Slice/escape/Clash.ice3
-rw-r--r--cpp/test/Slice/escape/Client.cpp3
-rw-r--r--cpp/test/Slice/escape/Key.ice3
-rw-r--r--cpp/test/Slice/escape/Makefile.mk3
-rw-r--r--cpp/test/Slice/headers/test.py3
-rw-r--r--cpp/test/Slice/macros/Client.cpp3
-rw-r--r--cpp/test/Slice/macros/Test.ice3
-rw-r--r--cpp/test/Slice/parser/CircularA.ice3
-rw-r--r--cpp/test/Slice/parser/CircularB.ice3
-rw-r--r--cpp/test/Slice/structure/Client.cpp3
-rw-r--r--cpp/test/Slice/structure/Test.ice3
-rw-r--r--cpp/test/Slice/unicodePaths/test.py3
-rw-r--r--cpp/test/Slice/utf8BOM/Test.ice3
-rw-r--r--cpp/test/include/TestHelper.h3
-rw-r--r--cpp/test/ios/controller/Bundle/ControllerI.mm3
-rw-r--r--cpp/test/ios/controller/Classes/AppDelegate.h3
-rw-r--r--cpp/test/ios/controller/Classes/AppDelegate.m3
-rw-r--r--cpp/test/ios/controller/Classes/ControllerView.h3
-rw-r--r--cpp/test/ios/controller/Classes/ControllerView.m3
-rw-r--r--cpp/test/ios/controller/Classes/main.m3
-rw-r--r--cpp/test/ios/controller/Makefile.mk3
-rw-r--r--cpp/test/uwp/controller/App.xaml.cpp3
-rw-r--r--cpp/test/uwp/controller/App.xaml.h3
-rw-r--r--cpp/test/uwp/controller/ControllerView.xaml.cpp3
-rw-r--r--cpp/test/uwp/controller/ControllerView.xaml.h3
1472 files changed, 0 insertions, 4440 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index a05d18b2c1b..37c27608e26 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
top_srcdir := ..
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 5f2e7ae6cbd..0a12ee46165 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import os, sys
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 544d253b001..75f4f84610c 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
# ----------------------------------------------------------------------
diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules
index 3bf6190fb62..6a7ab5c0f2e 100644
--- a/cpp/config/Make.xcodesdk.rules
+++ b/cpp/config/Make.xcodesdk.rules
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
include $(top_srcdir)/config/Make.xcodesdk.rules
diff --git a/cpp/config/ice_ca.cnf b/cpp/config/ice_ca.cnf
index 1a454236b4b..4fd2add9ebf 100644
--- a/cpp/config/ice_ca.cnf
+++ b/cpp/config/ice_ca.cnf
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index b1619fc64c4..42511781fb9 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -3,9 +3,6 @@
Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
**********************************************************************
-->
diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h
index fa956217d65..6f0b5e332f0 100644
--- a/cpp/include/Glacier2/Application.h
+++ b/cpp/include/Glacier2/Application.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_APPLICATION_H
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h
index c9a86faacc0..593bf34dfb0 100644
--- a/cpp/include/Glacier2/Config.h
+++ b/cpp/include/Glacier2/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_CONFIG_H
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index 5de9023bb8f..b0f8b76e6e7 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_H
diff --git a/cpp/include/Glacier2/NullPermissionsVerifier.h b/cpp/include/Glacier2/NullPermissionsVerifier.h
index 5b0419d74bd..d27b31f6a7f 100644
--- a/cpp/include/Glacier2/NullPermissionsVerifier.h
+++ b/cpp/include/Glacier2/NullPermissionsVerifier.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_NULL_PERMISSIONS_VERIFIER_H
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 07618f6d9c2..964117daf9f 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_SESSION_HELPER_H
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index daa7c1434f8..891d87ef076 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_APPLICATION_H
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 17d57f99273..4f63029fa4c 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ASYNC_RESULT_H
diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h
index d12a8f2c1f5..de8ad2663ca 100644
--- a/cpp/include/Ice/AsyncResultF.h
+++ b/cpp/include/Ice/AsyncResultF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ASYNC_RESULT_F_H
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index c068385a8f2..9b6191a398e 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H
diff --git a/cpp/include/Ice/BatchRequestQueueF.h b/cpp/include/Ice/BatchRequestQueueF.h
index 4265dc9c6b5..bc060d79a05 100644
--- a/cpp/include/Ice/BatchRequestQueueF.h
+++ b/cpp/include/Ice/BatchRequestQueueF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_F_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 4a8de4319aa..6c6c61c74ef 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BUFFER_H
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 7f63be2ea02..3f533d651e5 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_COMMUNICATOR_ASYNC_H
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
index 8d9f522221a..7c2f5ad95da 100644
--- a/cpp/include/Ice/Comparable.h
+++ b/cpp/include/Ice/Comparable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_COMPARABLE_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 8f055757337..291bc05c294 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index bbc7b3c1db3..8825b143446 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_ASYNC_H
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index b53d45e8311..659649948d7 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTIONI_F_H
diff --git a/cpp/include/Ice/ConsoleUtil.h b/cpp/include/Ice/ConsoleUtil.h
index 6cc562a3788..0854ff2b563 100644
--- a/cpp/include/Ice/ConsoleUtil.h
+++ b/cpp/include/Ice/ConsoleUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONSOLE_UTIL_H
diff --git a/cpp/include/Ice/DefaultValueFactory.h b/cpp/include/Ice/DefaultValueFactory.h
index e524b83cff7..feb07731fcf 100644
--- a/cpp/include/Ice/DefaultValueFactory.h
+++ b/cpp/include/Ice/DefaultValueFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DEFAULT_VALUE_FACTORY_H
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index c451eab6e27..a0af296e99e 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DISPATCH_INTERCEPTOR_H
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 5e10f9a567e..9ec33940275 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DISPATCHER_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index d8e88f57bfa..b9a9205d5e7 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index 2be797280f5..f465efffc7c 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index bd3b60193ae..df3b1f6bc5a 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_EXCEPTION_H
diff --git a/cpp/include/Ice/ExceptionHelpers.h b/cpp/include/Ice/ExceptionHelpers.h
index 993429a9baa..22d2d26c902 100644
--- a/cpp/include/Ice/ExceptionHelpers.h
+++ b/cpp/include/Ice/ExceptionHelpers.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_EXCEPTION_HELPERS_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index be8951060ef..e0064be94c8 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 0ffd8fe7337..60c751564ea 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_FACTORYTABLEINIT_H
diff --git a/cpp/include/Ice/Format.h b/cpp/include/Ice/Format.h
index 121be354294..ea0c203a02b 100644
--- a/cpp/include/Ice/Format.h
+++ b/cpp/include/Ice/Format.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_FORMAT_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 0f578ed638b..b04bd48d418 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_FUNCTIONAL_H
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index ff23cbfae49..19242ea25ad 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GC_OBJECT_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 69052ad5979..db3cbb95929 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index e09c5c23d01..c2ad572ea8f 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ICE_H
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
index e2c4ae2d9e6..634fba965a2 100644
--- a/cpp/include/Ice/IconvStringConverter.h
+++ b/cpp/include/Ice/IconvStringConverter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ICONV_STRING_CONVERTER
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index e8adad513c4..e378650a65d 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INCOMING_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 63c1435af68..746b11afb84 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 64c0a3a1f68..8f4a257d71a 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INCOMING_ASYNC_F_H
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 1fe9fd828cf..3df5d289d09 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INITIALIZE_H
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index a36c403c448..decd266abe8 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INPUT_STREAM_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 80618f56ea7..69bfaf2f786 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INSTANCE_F_H
diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
index e1540935d80..77c45e21246 100644
--- a/cpp/include/Ice/InterfaceByValue.h
+++ b/cpp/include/Ice/InterfaceByValue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INTERFACE_BY_VALUE_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index dedfe0178cd..5f6616ddcfe 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 2e14b9ac5ef..8086d0c8e52 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOCAL_OBJECT_F_H
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 17c569f88ad..901f2ec7f27 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOGGER_UTIL_H
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index f74ed2f278e..51a9965cf1c 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_METRICSADMIN_I_H
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h
index 41504cc1fc8..32207cd26ad 100644
--- a/cpp/include/Ice/MetricsFunctional.h
+++ b/cpp/include/Ice/MetricsFunctional.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_METRICSFUNCTIONAL_H
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index 8e65dd0a74c..d064695c20b 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEMX_METRICSOBSERVER_I_H
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index 87908fa34e2..591f8b30b27 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_H
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index c752e8f3fac..925908ddce4 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBJECT_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index 2a490e25d7d..2118e5242a2 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBJECT_F_H
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h
index 74655b8d663..930b81f4a85 100644
--- a/cpp/include/Ice/ObserverHelper.h
+++ b/cpp/include/Ice/ObserverHelper.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBSERVERHELPER_H
diff --git a/cpp/include/Ice/Optional.h b/cpp/include/Ice/Optional.h
index 899be0aa1ac..5b329c17610 100644
--- a/cpp/include/Ice/Optional.h
+++ b/cpp/include/Ice/Optional.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
//
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 7fdf54493e2..725cede24b7 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 51b76238f7d..bc6ee2eaa3d 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
index 2d8aaeaf029..4aeec5ab31a 100644
--- a/cpp/include/Ice/OutputStream.h
+++ b/cpp/include/Ice/OutputStream.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OUTPUT_STREAM_H
diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
index f8c49dcdec4..a4026a9557f 100644
--- a/cpp/include/Ice/Protocol.h
+++ b/cpp/include/Ice/Protocol.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 08445dfc75f..3bbd25fe25f 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index a109f5595ec..d14735a3567 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index 78708f92c51..ffa016cc1f4 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_FACTORY_F_H
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 07dbe60d73b..27480dfb09a 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index f287e961c5d..b9f3f0c1f03 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_F_H
diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h
index 11d3f5ca320..e2900f5951f 100644
--- a/cpp/include/Ice/RegisterPlugins.h
+++ b/cpp/include/Ice/RegisterPlugins.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_H
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index 7876382f18d..ab401191b8b 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_F_H
diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h
index 01e70023d6b..593aa95e716 100644
--- a/cpp/include/Ice/ResponseHandlerF.h
+++ b/cpp/include/Ice/ResponseHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_F_H
diff --git a/cpp/include/Ice/SHA1.h b/cpp/include/Ice/SHA1.h
index bfc8cea3243..e70db769f22 100644
--- a/cpp/include/Ice/SHA1.h
+++ b/cpp/include/Ice/SHA1.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SHA1_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index 0968ec3277f..c43b9afb7e1 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_F_H
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index fd7a8a27fde..3a21de4c84b 100644
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SERVICE_H
diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h
index 2e0a6babc98..dfb23ff90bc 100644
--- a/cpp/include/Ice/SliceChecksums.h
+++ b/cpp/include/Ice/SliceChecksums.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SLICE_CHECKSUM_H
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index 08e7b5ccc5a..0de33978e7a 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SLICED_DATA_H
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h
index 662e22f77b6..ba506a2a7a6 100644
--- a/cpp/include/Ice/SlicedDataF.h
+++ b/cpp/include/Ice/SlicedDataF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SLICED_DATA_F_H
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 59bc1406fde..40ddbfcdbb4 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_HELPERS_H
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
index 3bfb7beb867..f98ee2561be 100644
--- a/cpp/include/Ice/StringConverter.h
+++ b/cpp/include/Ice/StringConverter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STRING_CONVERTER_H
diff --git a/cpp/include/Ice/ThreadPoolF.h b/cpp/include/Ice/ThreadPoolF.h
index 2144154bb78..575b7da5d11 100644
--- a/cpp/include/Ice/ThreadPoolF.h
+++ b/cpp/include/Ice/ThreadPoolF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_THREAD_POOL_F_H
diff --git a/cpp/include/Ice/UUID.h b/cpp/include/Ice/UUID.h
index ab3806842a0..36084a36caf 100644
--- a/cpp/include/Ice/UUID.h
+++ b/cpp/include/Ice/UUID.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UUID_H
diff --git a/cpp/include/Ice/UniquePtr.h b/cpp/include/Ice/UniquePtr.h
index 37c335dd431..1400a6f71c8 100644
--- a/cpp/include/Ice/UniquePtr.h
+++ b/cpp/include/Ice/UniquePtr.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UNIQUE_PTR_H
diff --git a/cpp/include/Ice/UniqueRef.h b/cpp/include/Ice/UniqueRef.h
index 6da164e378b..5be41e39955 100644
--- a/cpp/include/Ice/UniqueRef.h
+++ b/cpp/include/Ice/UniqueRef.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UNIQUE_REF_H
diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index f56742b394f..e1c7139188e 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index 11ac8de6465..c5c021a457b 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_VALUE_H
diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h
index 18344ddf729..f5aa31adfb3 100644
--- a/cpp/include/Ice/ValueF.h
+++ b/cpp/include/Ice/ValueF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_VALUE_F_H
diff --git a/cpp/include/IceBT/IceBT.h b/cpp/include/IceBT/IceBT.h
index 82033b21680..8fb4a393805 100644
--- a/cpp/include/IceBT/IceBT.h
+++ b/cpp/include/IceBT/IceBT.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_ICE_BT_H
diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile
index 65c4ff437e6..68465fe71c9 100644
--- a/cpp/include/IceBT/Makefile
+++ b/cpp/include/IceBT/Makefile
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
top_srcdir = ../..
diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h
index 5cf5030edf0..9b80afa7ef2 100644
--- a/cpp/include/IceBT/Plugin.h
+++ b/cpp/include/IceBT/Plugin.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_PLUGIN_H
diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h
index 68dbcce10c0..91daa406d4f 100644
--- a/cpp/include/IceBox/Config.h
+++ b/cpp/include/IceBox/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEBOX_CONFIG_H
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
index b01e5839a0b..2c0b7de71f1 100644
--- a/cpp/include/IceGrid/Config.h
+++ b/cpp/include/IceGrid/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_CONFIG_H
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index 13f3ab086e2..216ba10167e 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_H
diff --git a/cpp/include/IceGrid/ReplicaGroupFilter.h b/cpp/include/IceGrid/ReplicaGroupFilter.h
index 849fa9fe71e..4e093421224 100644
--- a/cpp/include/IceGrid/ReplicaGroupFilter.h
+++ b/cpp/include/IceGrid/ReplicaGroupFilter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_H
diff --git a/cpp/include/IceIAP/IceIAP.h b/cpp/include/IceIAP/IceIAP.h
index 2244b634282..34e730607a1 100644
--- a/cpp/include/IceIAP/IceIAP.h
+++ b/cpp/include/IceIAP/IceIAP.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IAP_ICE_IAP_H
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index a38f5c0df89..b569e5d4385 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PATCH2_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
index a5395aa807a..91fd1f02387 100644
--- a/cpp/include/IcePatch2/Config.h
+++ b/cpp/include/IcePatch2/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PATCH2_CONFIG_H
diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h
index 579f26e6842..c0efdc9637f 100644
--- a/cpp/include/IcePatch2/IcePatch2.h
+++ b/cpp/include/IcePatch2/IcePatch2.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IcePatch2/Config.h>
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 0048ac5a763..fa452f2db37 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_CONFIG_H
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index 804c5b9d567..b6456dc839a 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_ICESSL_H
diff --git a/cpp/include/IceSSL/OpenSSL.h b/cpp/include/IceSSL/OpenSSL.h
index 299d7609b34..22b43f47f42 100644
--- a/cpp/include/IceSSL/OpenSSL.h
+++ b/cpp/include/IceSSL/OpenSSL.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_H
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index b5411132c5d..4a745d2e35c 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_PLUGIN_H
diff --git a/cpp/include/IceSSL/SChannel.h b/cpp/include/IceSSL/SChannel.h
index ef2635c8211..29d25cab30c 100644
--- a/cpp/include/IceSSL/SChannel.h
+++ b/cpp/include/IceSSL/SChannel.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNEL_H
diff --git a/cpp/include/IceSSL/SecureTransport.h b/cpp/include/IceSSL/SecureTransport.h
index 26a8d1ff2b1..ca9b234353c 100644
--- a/cpp/include/IceSSL/SecureTransport.h
+++ b/cpp/include/IceSSL/SecureTransport.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_H
diff --git a/cpp/include/IceSSL/UWP.h b/cpp/include/IceSSL/UWP.h
index 1f3fcaa80f0..6f687293543 100644
--- a/cpp/include/IceSSL/UWP.h
+++ b/cpp/include/IceSSL/UWP.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_UWP_H
diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
index 5486f042599..b92a40da748 100644
--- a/cpp/include/IceStorm/Config.h
+++ b/cpp/include/IceStorm/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STORM_CONFIG_H
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index b28cda09ea9..3492bd56e3e 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_ATOMIC_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index 3164412143a..19b561435c4 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 15d5107fe37..66d8c6ac257 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/ConsoleUtil.h b/cpp/include/IceUtil/ConsoleUtil.h
index 2d23afeddc8..03c60c429b3 100644
--- a/cpp/include/IceUtil/ConsoleUtil.h
+++ b/cpp/include/IceUtil/ConsoleUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_CONSOLE_UTIL_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index 8ba54983cc1..a319b7969a5 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 1084e974ad0..6792d182117 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h
index d9bf9fc6072..8d1576cbfc3 100644
--- a/cpp/include/IceUtil/DisableWarnings.h
+++ b/cpp/include/IceUtil/DisableWarnings.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_DISABLEWARNINGS_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 34504404eba..84ce16bbace 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_EXCEPTION_H
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index b17aaac1317..8f76a91b529 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_FILE_UTIL_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index e804bc4737c..2c8d8871b7d 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 616125fca70..c203fbd3774 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 6b4cdba4c39..6d0a162168c 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_ICE_UTIL_H
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index cc011797411..225017674b8 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_INPUT_UTIL_H
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index dda895cda2f..c9afa342f74 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 2afe2fe5614..5faa4d32059 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_LOCK_H
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index c3975937e9e..cd08fb281d4 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index edd06f0a3f1..7a13df276b7 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h
index 09f0325ebe5..9f998272adc 100644
--- a/cpp/include/IceUtil/MutexProtocol.h
+++ b/cpp/include/IceUtil/MutexProtocol.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PROTOCOL_H
diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h
index b0ac59b6df4..8930d80605d 100644
--- a/cpp/include/IceUtil/MutexPtrLock.h
+++ b/cpp/include/IceUtil/MutexPtrLock.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H
diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h
index cc94c1a6f33..4cf76045e6d 100644
--- a/cpp/include/IceUtil/MutexPtrTryLock.h
+++ b/cpp/include/IceUtil/MutexPtrTryLock.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index 7f4c8639eb1..6e6206e6ec1 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_OPTIONAL_H
diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index bcf7e9c6f09..9d06e969f22 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_OPTIONS_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index bc666d031ba..e1e34b5628e 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/PopDisableWarnings.h b/cpp/include/IceUtil/PopDisableWarnings.h
index 52665b3d6c4..726e972bb33 100644
--- a/cpp/include/IceUtil/PopDisableWarnings.h
+++ b/cpp/include/IceUtil/PopDisableWarnings.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
// No pragma once as this file can be included several times in a translation
diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h
index ad7a60105c2..a2b6f5b1bee 100644
--- a/cpp/include/IceUtil/PushDisableWarnings.h
+++ b/cpp/include/IceUtil/PushDisableWarnings.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
// No pragma once as this file can be included several times in a translation
diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h
index 3f18d9fc489..ef144e2f7e1 100644
--- a/cpp/include/IceUtil/Random.h
+++ b/cpp/include/IceUtil/Random.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_RANDOM_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 99924434625..95126a0aba0 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_RMUTEX_H
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index 2a36b30af25..e93e2e0f47b 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_RESOURCE_CONFIG_H
diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h
index c445d139778..26fc3949642 100644
--- a/cpp/include/IceUtil/ScannerConfig.h
+++ b/cpp/include/IceUtil/ScannerConfig.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_SCANNER_CONFIG_H
diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h
index 18a8db4143e..8040019ecb1 100644
--- a/cpp/include/IceUtil/ScopedArray.h
+++ b/cpp/include/IceUtil/ScopedArray.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_SCOPED_ARRAY_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index d0aad9307c6..900a59fccfc 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_SHARED_H
diff --git a/cpp/include/IceUtil/StopWatch.h b/cpp/include/IceUtil/StopWatch.h
index 80632d8e2ac..e6e3f6ec841 100644
--- a/cpp/include/IceUtil/StopWatch.h
+++ b/cpp/include/IceUtil/StopWatch.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_STOPWATCH_H
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h
index 61b684cdba7..bb94b06e22b 100644
--- a/cpp/include/IceUtil/StringConverter.h
+++ b/cpp/include/IceUtil/StringConverter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_STRING_CONVERTER_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 31670780c7b..83307013fc8 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 2c675306dcc..847da352fd9 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 5b196256154..316e672fe87 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_THREAD_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index c5119d46a04..e3b87489540 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_TIME_H
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index aece7a126f8..b258e2e2d50 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_TIMER_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index b9ba24a9ba9..51e6fb56437 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_UUID_H
diff --git a/cpp/include/IceUtil/UndefSysMacros.h b/cpp/include/IceUtil/UndefSysMacros.h
index c07f40dfa47..9d9b94857f7 100644
--- a/cpp/include/IceUtil/UndefSysMacros.h
+++ b/cpp/include/IceUtil/UndefSysMacros.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_UNDEF_SYS_MACROS_H
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index 10530705621..ec44083d713 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/Blobject.h>
diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h
index be9aea43761..d81d016ad55 100644
--- a/cpp/src/Glacier2/Blobject.h
+++ b/cpp/src/Glacier2/Blobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BLOBJECT_H
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp
index 65f92133f8d..2ab1871b293 100644
--- a/cpp/src/Glacier2/ClientBlobject.cpp
+++ b/cpp/src/Glacier2/ClientBlobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/ClientBlobject.h>
diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h
index eb57d110cd5..5d1765b6e79 100644
--- a/cpp/src/Glacier2/ClientBlobject.h
+++ b/cpp/src/Glacier2/ClientBlobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CLIENT_BLOBJECT_H
diff --git a/cpp/src/Glacier2/FilterI.cpp b/cpp/src/Glacier2/FilterI.cpp
index fc06d600db5..9153ff6497f 100644
--- a/cpp/src/Glacier2/FilterI.cpp
+++ b/cpp/src/Glacier2/FilterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Properties.h>
diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h
index 284dab63f04..098d75c53a8 100644
--- a/cpp/src/Glacier2/FilterI.h
+++ b/cpp/src/Glacier2/FilterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef FILTER_I_H
#define FILTER_I_H
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp
index 05e787fd55b..148583ebde5 100644
--- a/cpp/src/Glacier2/FilterManager.cpp
+++ b/cpp/src/Glacier2/FilterManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h
index fdc82b3458a..8fc7119b631 100644
--- a/cpp/src/Glacier2/FilterManager.h
+++ b/cpp/src/Glacier2/FilterManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef FILTER_MANAGER_H
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 03ce348a828..5f38d12a461 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/Glacier2/Instance.cpp b/cpp/src/Glacier2/Instance.cpp
index b81ea6b166f..0392c588d02 100644
--- a/cpp/src/Glacier2/Instance.cpp
+++ b/cpp/src/Glacier2/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h
index c74657f767c..7ec1f80d134 100644
--- a/cpp/src/Glacier2/Instance.h
+++ b/cpp/src/Glacier2/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_INSTANCE_H
diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice
index adfd9bc68c8..e86f35cedf5 100644
--- a/cpp/src/Glacier2/Instrumentation.ice
+++ b/cpp/src/Glacier2/Instrumentation.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/Glacier2/InstrumentationI.cpp b/cpp/src/Glacier2/InstrumentationI.cpp
index ced0cdf8f74..cd5efce3585 100644
--- a/cpp/src/Glacier2/InstrumentationI.cpp
+++ b/cpp/src/Glacier2/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/InstrumentationI.h>
diff --git a/cpp/src/Glacier2/InstrumentationI.h b/cpp/src/Glacier2/InstrumentationI.h
index 0c3882f4130..6b846d5e90e 100644
--- a/cpp/src/Glacier2/InstrumentationI.h
+++ b/cpp/src/Glacier2/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk
index 49750457d40..74fb91a3a44 100644
--- a/cpp/src/Glacier2/Makefile.mk
+++ b/cpp/src/Glacier2/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_programs := glacier2router
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index 007d43e2400..a08e3ee02ed 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/ProxyVerifier.h>
diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h
index f7f1e81770f..b5ba17a1222 100644
--- a/cpp/src/Glacier2/ProxyVerifier.h
+++ b/cpp/src/Glacier2/ProxyVerifier.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_VERIFIER_H
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index a4b9976233a..4e96253a3c5 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/RequestQueue.h>
diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h
index 7b36ce123f6..fb06e77c155 100644
--- a/cpp/src/Glacier2/RequestQueue.h
+++ b/cpp/src/Glacier2/RequestQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef REQUEST_H
diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
index 12c1e98d7b9..f32c1d06db9 100644
--- a/cpp/src/Glacier2/RouterI.cpp
+++ b/cpp/src/Glacier2/RouterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h
index 895c339f747..03d42898aac 100644
--- a/cpp/src/Glacier2/RouterI.h
+++ b/cpp/src/Glacier2/RouterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_ROUTER_I_H
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index 934f2fe556e..a5958dfffca 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/RoutingTable.h>
diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h
index 33d8a1dc0ce..ff50e384968 100644
--- a/cpp/src/Glacier2/RoutingTable.h
+++ b/cpp/src/Glacier2/RoutingTable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ROUTING_TABLE_H
diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index 36871828be3..c1a5a1ad79c 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/ServerBlobject.h>
diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h
index ef1703b98b7..5e81784e9d0 100644
--- a/cpp/src/Glacier2/ServerBlobject.h
+++ b/cpp/src/Glacier2/ServerBlobject.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SERVER_BLOBJECT_H
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 6b3831107b1..709c6428dda 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/SessionRouterI.h>
diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h
index 76196f9481b..4360837667f 100644
--- a/cpp/src/Glacier2/SessionRouterI.h
+++ b/cpp/src/Glacier2/SessionRouterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GLACIER2_SESSION_ROUTER_I_H
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
index f246171010d..7a13f6e0b28 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
index a6ac012c664..8f56b2d33ed 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries += Glacier2CryptPermissionsVerifier
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index b69ca6a10c1..ed30e5db11e 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/Application.h>
diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk
index 3cc5699513b..f2e43b6eb00 100644
--- a/cpp/src/Glacier2Lib/Makefile.mk
+++ b/cpp/src/Glacier2Lib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := Glacier2
diff --git a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
index 92cfdcf8a8c..a6690b42622 100644
--- a/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
+++ b/cpp/src/Glacier2Lib/NullPermissionsVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/PermissionsVerifier.h>
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index a5afb22d904..637cd84a5e1 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Glacier2/SessionHelper.h>
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index dfd8acab520..af83fc34e03 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ACM.h>
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index d0b1b56e8e3..a2bfb2e7e98 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ACM_H
diff --git a/cpp/src/Ice/ACMF.h b/cpp/src/Ice/ACMF.h
index f2755216fd1..db5b0ca11fb 100644
--- a/cpp/src/Ice/ACMF.h
+++ b/cpp/src/Ice/ACMF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ACM_F_H
diff --git a/cpp/src/Ice/Acceptor.cpp b/cpp/src/Ice/Acceptor.cpp
index 3f99998e026..f75b59f9e93 100644
--- a/cpp/src/Ice/Acceptor.cpp
+++ b/cpp/src/Ice/Acceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Acceptor.h>
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index ab86a82f096..6eea03359c2 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ACCEPTOR_H
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 4ce06920099..eef36343c05 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ACCEPTOR_F_H
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 3ab7bb57a05..21e884dda9a 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Application.h>
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index 44e4d43169c..e5eaf87b67c 100644
--- a/cpp/src/Ice/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/Ice/ArgVector.h b/cpp/src/Ice/ArgVector.h
index c9300df4a35..8dcdc024981 100644
--- a/cpp/src/Ice/ArgVector.h
+++ b/cpp/src/Ice/ArgVector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ARGVECTOR_H
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 4234a832ba4..34cf22b04c5 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index 2e9abcedf98..59f5f0234c3 100644
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Base64.h>
diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h
index 95b5a215685..e63d6ca8f43 100644
--- a/cpp/src/Ice/Base64.h
+++ b/cpp/src/Ice/Base64.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BASE_64_H
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index 5fc62127ece..6618d863cbd 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/BatchRequestQueue.h>
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index be759cc0aab..f87d0874c26 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BATCH_REQUEST_QUEUE_H
diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp
index 6a73213bf8d..00f557f3a68 100644
--- a/cpp/src/Ice/Buffer.cpp
+++ b/cpp/src/Ice/Buffer.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Buffer.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index 8dae5644cae..f00257f24f3 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/CollocatedRequestHandler.h>
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index f3bac1633d9..f0ed8b29f30 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 2f5d2e751cf..0a8a6a03815 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/CommunicatorI.h>
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 4273bbe5d63..776fde355d6 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_COMMUNICATOR_I_H
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp
index 96015dda0d2..02d4003bbdb 100644
--- a/cpp/src/Ice/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Cond.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 2ed48681bc8..0be8fe54899 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ConnectRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 2eef26cd062..dc0fbf45f23 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index 08856fa3808..8c82187b170 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 00eb3d7c4e8..40d76f896c9 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ConnectionFactory.h>
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 5ca310b65e1..7ae02361601 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_H
diff --git a/cpp/src/Ice/ConnectionFactoryF.h b/cpp/src/Ice/ConnectionFactoryF.h
index 2ff28fbc632..ff0d4734089 100644
--- a/cpp/src/Ice/ConnectionFactoryF.h
+++ b/cpp/src/Ice/ConnectionFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 4b4cede42b5..dc6691649e5 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 84ba7d2baac..956c72d9355 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_I_H
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index 276814dd575..72ae5a27581 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ConnectionRequestHandler.h>
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index f01c8cc704e..ed599b35547 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTION_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/Connector.cpp b/cpp/src/Ice/Connector.cpp
index f870c56ae45..be758b132eb 100644
--- a/cpp/src/Ice/Connector.cpp
+++ b/cpp/src/Ice/Connector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Connector.h>
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 0a1cbdb85da..c4b3b6e3e25 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTOR_H
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 6dbeb1bd778..29f7957885d 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_CONNECTOR_F_H
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index a81c7d2c433..e29393a059a 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/CountDownLatch.h>
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index 75e3de65306..f7da03b5bc5 100644
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ImplicitContextI.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 28ce655d279..030ee6e8c6d 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/DefaultsAndOverrides.h>
diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h
index 26bbf33e767..7d95ca7ee11 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.h
+++ b/cpp/src/Ice/DefaultsAndOverrides.h
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h
index 767ca1108c6..1336077b536 100644
--- a/cpp/src/Ice/DefaultsAndOverridesF.h
+++ b/cpp/src/Ice/DefaultsAndOverridesF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp
index f9039154627..fa41f4796c4 100644
--- a/cpp/src/Ice/DispatchInterceptor.cpp
+++ b/cpp/src/Ice/DispatchInterceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/DispatchInterceptor.h>
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 59ffeb61e1d..75dea12610b 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/DynamicLibrary.h>
diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp
index 41d3ff41a42..d040c737b8a 100644
--- a/cpp/src/Ice/EndpointFactory.cpp
+++ b/cpp/src/Ice/EndpointFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/EndpointFactory.h>
diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h
index 7e9f4f57bbe..8333b820ea5 100644
--- a/cpp/src/Ice/EndpointFactory.h
+++ b/cpp/src/Ice/EndpointFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/src/Ice/EndpointFactoryF.h b/cpp/src/Ice/EndpointFactoryF.h
index 8bbdaf29fcc..10fa4cc5311 100644
--- a/cpp/src/Ice/EndpointFactoryF.h
+++ b/cpp/src/Ice/EndpointFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index f023a6306ce..ea653bb55f5 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/EndpointFactoryManager.h>
diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index 2a6b017ba93..eb2fc71d983 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H
diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h
index 010f02628e1..32e21e25a67 100644
--- a/cpp/src/Ice/EndpointFactoryManagerF.h
+++ b/cpp/src/Ice/EndpointFactoryManagerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index 6a870473439..367795c6477 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/EndpointI.h>
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index b0ceb38ae6e..b46abe30208 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_I_H
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index c3dd73501c8..d8dc7e20fd7 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 5e348f2654f..3cb1d2138a7 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/EventHandler.h>
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 74b92361d1b..99f8b4cc1b6 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_EVENT_HANDLER_H
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index f9495bcd0f8..6b95c6ed842 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_EVENT_HANDLER_F_H
diff --git a/cpp/src/Ice/EventLoggerMsg.mc b/cpp/src/Ice/EventLoggerMsg.mc
index 0265e835eac..7f512f34025 100755
--- a/cpp/src/Ice/EventLoggerMsg.mc
+++ b/cpp/src/Ice/EventLoggerMsg.mc
@@ -2,9 +2,6 @@
; //
; // Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
; //
-; // This copy of Ice is licensed to you under the terms described in the
-; // ICE_LICENSE file included in this distribution.
-; //
; // **********************************************************************
MessageId=0x0
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 51b9bd77c3c..459cdcfc8fa 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Exception.h>
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 570c1414a7f..3fea598436a 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/FactoryTable.h>
diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index 211239f9748..7230b1711b0 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/FactoryTableInit.h>
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 92a2e34bfe9..988185c446d 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/GCObject.h>
diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h
index 14b9547e2c7..15faa844157 100644
--- a/cpp/src/Ice/HashUtil.h
+++ b/cpp/src/Ice/HashUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_HASH_UTIL_H
diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
index 9d0139a5e9e..d1578c59d03 100644
--- a/cpp/src/Ice/HttpParser.cpp
+++ b/cpp/src/Ice/HttpParser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/Ice/HttpParser.h b/cpp/src/Ice/HttpParser.h
index 449504b55ad..af992fe7e0e 100644
--- a/cpp/src/Ice/HttpParser.h
+++ b/cpp/src/Ice/HttpParser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_HTTP_PARSER_H
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index b4c86f7b456..54aebd7641e 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/IPEndpointI.h>
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 427bb738ede..1c676668a54 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index ad6350e1030..4feace4fae4 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IP_ENDPOINT_I_F_H
diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp
index c6d50f9fc15..30665bba5a5 100644
--- a/cpp/src/Ice/IconvStringConverter.cpp
+++ b/cpp/src/Ice/IconvStringConverter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/IconvStringConverter.h>
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 0ebb4dad963..74f5c9ed209 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ImplicitContextI.h>
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index 44fc9683e29..ec81e4f944e 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IMPLICIT_CONTEXT_I_H
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 3e1b87e9f3e..e8ee2feb844 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Incoming.h>
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 0c90aa4a240..543a0419565 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/IncomingAsync.h>
diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h
index 9c3251e9701..a3e40ee4965 100644
--- a/cpp/src/Ice/IncomingRequest.h
+++ b/cpp/src/Ice/IncomingRequest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INCOMING_REQUEST_H
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 916992cc7ff..b81cc91bdab 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp
index d10d1324e3c..943b51f255d 100644
--- a/cpp/src/Ice/InputStream.cpp
+++ b/cpp/src/Ice/InputStream.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index a701e3325e7..d8dd997e45c 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Instance.h>
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 968af794fe5..1570969aaa6 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INSTANCE_H
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index e323f7e128a..449356d43e3 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/InstrumentationI.h>
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 3319887de68..2ead12457ab 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_INSTRUMENTATION_I_H
diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp
index b719bf5dee4..254bd23c08a 100644
--- a/cpp/src/Ice/LocalObject.cpp
+++ b/cpp/src/Ice/LocalObject.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/LocalObject.h>
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 131261c688a..7b686ed898b 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 9b0517b10bb..974faaebc95 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOCATOR_INFO_H
diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h
index d568f67ec5b..170c3b47368 100644
--- a/cpp/src/Ice/LocatorInfoF.h
+++ b/cpp/src/Ice/LocatorInfoF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOCATOR_INFO_F_H
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index c2611e48d2c..c9d4169be3c 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/LoggerAdminI.h>
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index 2e14f1aad8c..b1a97416271 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOGGER_ADMIN_I_H
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index 647ce587c3a..bed87c9beb9 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Time.h>
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 953b5deaa73..f71bcef9aa5 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_LOGGER_I_H
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index cb63b12a3df..67798cc290c 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/LoggerUtil.h>
diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk
index db471cb2966..84e2ee5cbfd 100644
--- a/cpp/src/Ice/Makefile.mk
+++ b/cpp/src/Ice/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries = Ice
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index 61f01beca24..5dd55417f51 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/MetricsAdminI.h>
diff --git a/cpp/src/Ice/MetricsObserverI.cpp b/cpp/src/Ice/MetricsObserverI.cpp
index de288e38252..81accf60ec1 100644
--- a/cpp/src/Ice/MetricsObserverI.cpp
+++ b/cpp/src/Ice/MetricsObserverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/MetricsObserverI.h>
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 592ff9ab9c1..0b7739a1900 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
//
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 7d944d7f899..470c35816e0 100755
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_NETWORK_H
diff --git a/cpp/src/Ice/NetworkF.h b/cpp/src/Ice/NetworkF.h
index 64c2bf48b08..8bde8bc0526 100644
--- a/cpp/src/Ice/NetworkF.h
+++ b/cpp/src/Ice/NetworkF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_NETWORK_F_H
diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
index 29d7bb25856..64514c70905 100644
--- a/cpp/src/Ice/NetworkProxy.cpp
+++ b/cpp/src/Ice/NetworkProxy.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/NetworkProxy.h>
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index 727c7fc7f19..fe3f7a896e4 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_NETWORK_PROXY_H
diff --git a/cpp/src/Ice/NetworkProxyF.h b/cpp/src/Ice/NetworkProxyF.h
index ba51bc84258..dc30f562150 100644
--- a/cpp/src/Ice/NetworkProxyF.h
+++ b/cpp/src/Ice/NetworkProxyF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_NETWORK_PROXY_F_H
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 770dcbfd6d9..74e228aba5b 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Object.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 1073e645470..82b2d31cd80 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ObjectAdapterFactory.h>
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 90cbe3ec76c..b80d71ece70 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
diff --git a/cpp/src/Ice/ObjectAdapterFactoryF.h b/cpp/src/Ice/ObjectAdapterFactoryF.h
index 25caac5cf31..58d1c0702d3 100644
--- a/cpp/src/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/src/Ice/ObjectAdapterFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 61b3c336c48..dbe6b87eeb4 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 9a0a6f29a97..209faa28e78 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_OBJECT_ADAPTER_I_H
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index 73d0b5f2a39..a205267e1a5 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ObserverHelper.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index 608d29a4386..40b2a0061b4 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/OpaqueEndpointI.h>
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index d57e229f2a8..6c65eaafa09 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UNKNOWN_ENDPOINT_I_H
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 9ddb9741a90..9ca32e6029a 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/OutgoingAsync.h>
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 576b2dab63e..53c4c32a175 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/OutputStream.h>
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index cb43e2c30d6..bc8aae6e9b8 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 2d9c56d9171..d3b9089e51f 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PLUGIN_MANAGER_I_H
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index 5e254bf4e0f..a198fe7832f 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/PropertiesAdminI.h>
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 44a13de43fb..82a1e2da26c 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROPERTIES_ADMIN_I_H
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 5e07681028b..7bdbe96add9 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/PropertiesI.h>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index a00d94c69f0..fcdf42cbbdc 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROPERTIES_I_H
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 62d15554ac3..213ee6c2553 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index fc707a3e868..0f5df4cb150 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Oct 25 22:10:11 2018
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 3d0fe2cd1d3..62d0d2706f7 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Protocol.h>
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp
index 8c8d4671231..bf2e7b67b7f 100644
--- a/cpp/src/Ice/ProtocolInstance.cpp
+++ b/cpp/src/Ice/ProtocolInstance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ProtocolInstance.h>
diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index 744848040c6..c6f2893219c 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_H
diff --git a/cpp/src/Ice/ProtocolInstanceF.h b/cpp/src/Ice/ProtocolInstanceF.h
index 47ee2a4220f..8c5fe3bd8ca 100644
--- a/cpp/src/Ice/ProtocolInstanceF.h
+++ b/cpp/src/Ice/ProtocolInstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_INSTANCE_F_H
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index b224e0b0eeb..a9030670517 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ProtocolPluginFacade.h>
diff --git a/cpp/src/Ice/ProtocolPluginFacade.h b/cpp/src/Ice/ProtocolPluginFacade.h
index 7f2cb6f3d59..8b8375a2537 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.h
+++ b/cpp/src/Ice/ProtocolPluginFacade.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/src/Ice/ProtocolPluginFacadeF.h b/cpp/src/Ice/ProtocolPluginFacadeF.h
index 6a05233d968..ba1c9a4e6df 100644
--- a/cpp/src/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/src/Ice/ProtocolPluginFacadeF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index ef0c017f26c..85871b699b9 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Proxy.h>
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index c7daeeb0edd..d3e0f115314 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 79e28eabd6e..8169b09e9d1 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PROXY_FACTORY_H
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index b534be1fe6a..3c6f90537a2 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Reference.h>
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index bd7fa1ac906..bf7ca251603 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_H
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 7a9e25a1eac..d5efd50b77d 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index f9539dbe1dc..6efa856dea2 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_H
diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h
index 7c43fa65284..a1879a4abf1 100644
--- a/cpp/src/Ice/ReferenceFactoryF.h
+++ b/cpp/src/Ice/ReferenceFactoryF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REFERENCE_FACTORY_F_H
diff --git a/cpp/src/Ice/RegisterPluginsInit.cpp b/cpp/src/Ice/RegisterPluginsInit.cpp
index c2ed592d0d3..c7039137062 100644
--- a/cpp/src/Ice/RegisterPluginsInit.cpp
+++ b/cpp/src/Ice/RegisterPluginsInit.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/RegisterPluginsInit.h>
diff --git a/cpp/src/Ice/RegisterPluginsInit.h b/cpp/src/Ice/RegisterPluginsInit.h
index 8ed7a5a50fa..9dad32d4bec 100644
--- a/cpp/src/Ice/RegisterPluginsInit.h
+++ b/cpp/src/Ice/RegisterPluginsInit.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REGISTER_PLUGINS_INIT_H
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
index 2633feb789e..224370ce2a4 100644
--- a/cpp/src/Ice/ReplyStatus.h
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REPLY_STATUS_H
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index be63d79a18b..6de365336d4 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/RequestHandler.h>
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 2d7ddf09182..3aafaa56827 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_H
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index a139520e4ac..4643212694e 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/RequestHandlerFactory.h>
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index bad2cfccbe4..5e71d791109 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_REQUEST_HANDLER_FACTORY_H
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index 4d8b4e71532..77054e9ab83 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ResponseHandler.h>
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index f973c1e5a8b..5cf8e2b1b66 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_RESPONSE_HANDLER_H
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index ef03612394c..429d066b32c 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/RetryQueue.h>
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index 926e7065219..eebf96854ec 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_RETRY_QUEUE_H
diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h
index 59669fef321..9fbee7c7d98 100644
--- a/cpp/src/Ice/RetryQueueF.h
+++ b/cpp/src/Ice/RetryQueueF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_RETRY_QUEUE_F_H
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 7a41655bbb0..d63fdacbfa0 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/RouterInfo.h>
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 24a2b041232..3c47bbeae6a 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ROUTER_INFO_H
diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h
index 84c7765b08e..2f90339650d 100644
--- a/cpp/src/Ice/RouterInfoF.h
+++ b/cpp/src/Ice/RouterInfoF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_ROUTER_INFO_F_H
diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 3965812c7f8..1db71b10ec1 100644
--- a/cpp/src/Ice/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/SHA1.h>
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index 3db6055b573..ff25ccc4edf 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Selector.h>
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index a8057cd5329..f98f49ccbb9 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SELECTOR_H
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index d37efcca70b..2ef28025948 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ServantManager.h>
diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h
index 23f6fc9e9b9..cc6518a2ebb 100644
--- a/cpp/src/Ice/ServantManager.h
+++ b/cpp/src/Ice/ServantManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SERVANT_MANAGER_H
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index c37ab74f235..be5003ed818 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h
index bf1fd1a9e0e..2d2d46fb890 100644
--- a/cpp/src/Ice/SharedContext.h
+++ b/cpp/src/Ice/SharedContext.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SHARED_CONTEXT_H
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp
index f59d8d7f86d..3ac1532b3eb 100644
--- a/cpp/src/Ice/SliceChecksums.cpp
+++ b/cpp/src/Ice/SliceChecksums.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/SliceChecksums.h>
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index 3e44e8f872e..0ea0ae95bde 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/SlicedData.h>
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp
index e38898f2568..c6459cde7bf 100755
--- a/cpp/src/Ice/StreamSocket.cpp
+++ b/cpp/src/Ice/StreamSocket.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/StreamSocket.h>
diff --git a/cpp/src/Ice/StreamSocket.h b/cpp/src/Ice/StreamSocket.h
index 1462b19faaf..922f72216f9 100644
--- a/cpp/src/Ice/StreamSocket.h
+++ b/cpp/src/Ice/StreamSocket.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_SOCKET_H
diff --git a/cpp/src/Ice/StringConverterPlugin.cpp b/cpp/src/Ice/StringConverterPlugin.cpp
index 5efeee5ff77..5ebaa1d03a7 100644
--- a/cpp/src/Ice/StringConverterPlugin.cpp
+++ b/cpp/src/Ice/StringConverterPlugin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Config.h>
diff --git a/cpp/src/Ice/StringUtil.h b/cpp/src/Ice/StringUtil.h
index 1df4976061e..6be689ce874 100644
--- a/cpp/src/Ice/StringUtil.h
+++ b/cpp/src/Ice/StringUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STRING_UTIL_H
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index f3df83701f2..c105947749f 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef _WIN32
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index dd749076ef8..221c75a1614 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SYS_LOGGER_I_H
diff --git a/cpp/src/Ice/SystemdJournalI.cpp b/cpp/src/Ice/SystemdJournalI.cpp
index 295622a3b6c..06ac35f06b2 100644
--- a/cpp/src/Ice/SystemdJournalI.cpp
+++ b/cpp/src/Ice/SystemdJournalI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef ICE_USE_SYSTEMD
diff --git a/cpp/src/Ice/SystemdJournalI.h b/cpp/src/Ice/SystemdJournalI.h
index 852bae98c9e..ae5aedd140a 100644
--- a/cpp/src/Ice/SystemdJournalI.h
+++ b/cpp/src/Ice/SystemdJournalI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SYSTEMD_JOURNAL_I_H
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index b90f64ab3d0..2190cc05bf1 100755
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/TcpAcceptor.h>
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index 229a77f1180..c4ec822173f 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TCP_ACCEPTOR_H
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index c06e649cadc..0f51c2ae977 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/TcpConnector.h>
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index c8e366a1e67..b86542494d6 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TCP_CONNECTOR_H
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index bada6649a73..c64b9069447 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/TcpEndpointI.h>
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index fb887cb4a7d..e8d761a6529 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TCP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index c208a99b170..fe37b1637c3 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/TcpTransceiver.h>
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index f12e7e5a885..e5d2a03133d 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TCP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 1a12e3bd36a..3f22010481c 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef __sun
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index a73388eceeb..ae6bd81b9ab 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ThreadPool.h>
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index f86b993fe49..76e3218501e 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_THREAD_POOL_H
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 30f4aa5e0c2..3e62448ebe6 100644
--- a/cpp/src/Ice/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Timer.h>
diff --git a/cpp/src/Ice/TraceLevels.cpp b/cpp/src/Ice/TraceLevels.cpp
index b07273508f3..db69e96ca74 100644
--- a/cpp/src/Ice/TraceLevels.cpp
+++ b/cpp/src/Ice/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/TraceLevels.h>
diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h
index aac749452dd..9ac192f29ac 100644
--- a/cpp/src/Ice/TraceLevels.h
+++ b/cpp/src/Ice/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TRACE_LEVELS_H
diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h
index cab8cfe1502..565cf3baa0d 100644
--- a/cpp/src/Ice/TraceLevelsF.h
+++ b/cpp/src/Ice/TraceLevelsF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TRACE_LEVELS_F_H
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index c11ac73718a..4f394282b85 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Mutex.h>
diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h
index f7625551c08..c0f25d3ca17 100644
--- a/cpp/src/Ice/TraceUtil.h
+++ b/cpp/src/Ice/TraceUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TRACE_UTIL_H
diff --git a/cpp/src/Ice/Transceiver.cpp b/cpp/src/Ice/Transceiver.cpp
index 040d4d81af3..10f45b2e82a 100644
--- a/cpp/src/Ice/Transceiver.cpp
+++ b/cpp/src/Ice/Transceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Transceiver.h>
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 5f4a4a0d6d1..ea6171977bc 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TRANSCEIVER_H
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index 6a9be1df49a..d3e728fa6d2 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_TRANSCEIVER_F_H
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 1e781724915..43516704b3c 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UdpConnector.h>
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index a2871cb897e..92d49dcba31 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UDP_CONNECTOR_H
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index aeff0624e74..34a33df39a6 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UdpEndpointI.h>
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index 26ec12e511d..bed014f97ee 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UDP_ENDPOINT_I_H
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 62ea6b62e8c..3d2b13a4088 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UdpTransceiver.h>
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index 2ec9040d4c7..c681cef44f2 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UDP_TRANSCEIVER_H
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index e9cb132417e..855fb60beed 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Value.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp
index 31b3fcb31f2..6355e7a8edc 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.cpp
+++ b/cpp/src/Ice/ValueFactoryManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ValueFactoryManagerI.h>
diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h
index de3a3fc888a..ce79ce945cb 100644
--- a/cpp/src/Ice/ValueFactoryManagerI.h
+++ b/cpp/src/Ice/ValueFactoryManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_VALUE_FACTORY_MANAGER_I_H
diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h
index 29e1f0ab01d..0f64e441a02 100644
--- a/cpp/src/Ice/VirtualShared.h
+++ b/cpp/src/Ice/VirtualShared.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_VIRTUAL_SHARED_H
diff --git a/cpp/src/Ice/WSAcceptor.cpp b/cpp/src/Ice/WSAcceptor.cpp
index d97a711f562..9a4064edeae 100644
--- a/cpp/src/Ice/WSAcceptor.cpp
+++ b/cpp/src/Ice/WSAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/WSAcceptor.h>
diff --git a/cpp/src/Ice/WSAcceptor.h b/cpp/src/Ice/WSAcceptor.h
index ca271a2acfc..56e9f1978fb 100644
--- a/cpp/src/Ice/WSAcceptor.h
+++ b/cpp/src/Ice/WSAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_WS_ACCEPTOR_I_H
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index 3e3615e05fd..61bbad67242 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/WSConnector.h>
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index b3e31b1037f..fcfe3b15976 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_WSCONNECTOR_I_H
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index ca286ef1135..0bb0f32d1a5 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/WSEndpoint.h>
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 03608dd0359..e76fc3da814 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_WS_ENDPOINT_I_H
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
index 41afc44daac..9d3fa390c50 100644
--- a/cpp/src/Ice/WSTransceiver.cpp
+++ b/cpp/src/Ice/WSTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/WSTransceiver.h>
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index 680bc41c4e5..1f3ff4d652b 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_WS_TRANSCEIVER_I_H
diff --git a/cpp/src/Ice/ios/Notifications.mm b/cpp/src/Ice/ios/Notifications.mm
index 62e75c0d603..b8841593dac 100644
--- a/cpp/src/Ice/ios/Notifications.mm
+++ b/cpp/src/Ice/ios/Notifications.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import <Ice/Config.h>
diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp
index 7856c927bae..1f382bfdc33 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.cpp
+++ b/cpp/src/Ice/ios/StreamAcceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamAcceptor.h b/cpp/src/Ice/ios/StreamAcceptor.h
index 6585d03ca7b..6a6409d41f8 100644
--- a/cpp/src/Ice/ios/StreamAcceptor.h
+++ b/cpp/src/Ice/ios/StreamAcceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_ACCEPTOR_H
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
index e4b0bdd8131..da75a9e8276 100644
--- a/cpp/src/Ice/ios/StreamConnector.cpp
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
index b3d8a5371d3..ec373351c04 100644
--- a/cpp/src/Ice/ios/StreamConnector.h
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_CONNECTOR_H
diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp
index 3e8ef8bdee5..2f5b22acd4b 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.cpp
+++ b/cpp/src/Ice/ios/StreamEndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "StreamEndpointI.h"
diff --git a/cpp/src/Ice/ios/StreamEndpointI.h b/cpp/src/Ice/ios/StreamEndpointI.h
index 4347f3742db..4a5e82297fd 100644
--- a/cpp/src/Ice/ios/StreamEndpointI.h
+++ b/cpp/src/Ice/ios/StreamEndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_ENDPOINT_I_H
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
index c9f943ecd08..a4c047e5aab 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.cpp
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "StreamTransceiver.h"
diff --git a/cpp/src/Ice/ios/StreamTransceiver.h b/cpp/src/Ice/ios/StreamTransceiver.h
index 22fef490a3a..38cfd9de02b 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.h
+++ b/cpp/src/Ice/ios/StreamTransceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STREAM_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/AcceptorI.cpp b/cpp/src/IceBT/AcceptorI.cpp
index f1d940216bd..cab9a303fd0 100644
--- a/cpp/src/IceBT/AcceptorI.cpp
+++ b/cpp/src/IceBT/AcceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/AcceptorI.h>
diff --git a/cpp/src/IceBT/AcceptorI.h b/cpp/src/IceBT/AcceptorI.h
index 53300d27411..7803b2e9287 100644
--- a/cpp/src/IceBT/AcceptorI.h
+++ b/cpp/src/IceBT/AcceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_ACCEPTOR_I_H
diff --git a/cpp/src/IceBT/Config.h b/cpp/src/IceBT/Config.h
index ebb2bdde674..445cb0da9e1 100644
--- a/cpp/src/IceBT/Config.h
+++ b/cpp/src/IceBT/Config.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_CONFIG_H
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
index 55b7e43c5a8..48c111a3e18 100644
--- a/cpp/src/IceBT/ConnectorI.cpp
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/ConnectorI.h>
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
index 98a6e1ecc67..87d8cc9929f 100644
--- a/cpp/src/IceBT/ConnectorI.h
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_CONNECTOR_I_H
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 95f056de93c..8648db092fd 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/DBus.h>
diff --git a/cpp/src/IceBT/DBus.h b/cpp/src/IceBT/DBus.h
index dcc7ae8be8a..6c89e3a8f2d 100644
--- a/cpp/src/IceBT/DBus.h
+++ b/cpp/src/IceBT/DBus.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_DBUS_H
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp
index 02defca3ddd..068bcaca30f 100644
--- a/cpp/src/IceBT/EndpointI.cpp
+++ b/cpp/src/IceBT/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/EndpointI.h>
diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h
index 33a99715e2e..9d9e1c655a2 100644
--- a/cpp/src/IceBT/EndpointI.h
+++ b/cpp/src/IceBT/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_ENDPOINT_I_H
diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
index 10dfd2b4dd7..4eda781a3a6 100644
--- a/cpp/src/IceBT/Engine.cpp
+++ b/cpp/src/IceBT/Engine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/Engine.h>
diff --git a/cpp/src/IceBT/Engine.h b/cpp/src/IceBT/Engine.h
index e3094a22fac..7dfec79ad15 100644
--- a/cpp/src/IceBT/Engine.h
+++ b/cpp/src/IceBT/Engine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_ENGINE_H
diff --git a/cpp/src/IceBT/EngineF.h b/cpp/src/IceBT/EngineF.h
index e93cd6d230b..80f5b6c0757 100644
--- a/cpp/src/IceBT/EngineF.h
+++ b/cpp/src/IceBT/EngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_ENGINE_F_H
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp
index e2d0c74d883..6487f1193c6 100644
--- a/cpp/src/IceBT/Instance.cpp
+++ b/cpp/src/IceBT/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/Instance.h>
diff --git a/cpp/src/IceBT/Instance.h b/cpp/src/IceBT/Instance.h
index 15a78bf8de0..f7e75f8ce71 100644
--- a/cpp/src/IceBT/Instance.h
+++ b/cpp/src/IceBT/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_INSTANCE_H
diff --git a/cpp/src/IceBT/InstanceF.h b/cpp/src/IceBT/InstanceF.h
index 90a9df372e9..8bc8e8e7b74 100644
--- a/cpp/src/IceBT/InstanceF.h
+++ b/cpp/src/IceBT/InstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_INSTANCE_F_H
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
index ac93e2d9906..277a02f76c8 100644
--- a/cpp/src/IceBT/Makefile.mk
+++ b/cpp/src/IceBT/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
index e1ac6c50fc3..b0a68be305a 100644
--- a/cpp/src/IceBT/PluginI.cpp
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/PluginI.h>
diff --git a/cpp/src/IceBT/PluginI.h b/cpp/src/IceBT/PluginI.h
index 937e818c93b..4bb603788ab 100644
--- a/cpp/src/IceBT/PluginI.h
+++ b/cpp/src/IceBT/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_PLUGIN_I_H
diff --git a/cpp/src/IceBT/StreamSocket.cpp b/cpp/src/IceBT/StreamSocket.cpp
index 7a9ba6fb4e6..400b2ea7382 100644
--- a/cpp/src/IceBT/StreamSocket.cpp
+++ b/cpp/src/IceBT/StreamSocket.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/StreamSocket.h>
diff --git a/cpp/src/IceBT/StreamSocket.h b/cpp/src/IceBT/StreamSocket.h
index 2800cb37960..62134210a3d 100644
--- a/cpp/src/IceBT/StreamSocket.h
+++ b/cpp/src/IceBT/StreamSocket.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_STREAM_SOCKET_H
diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
index 54b770ffded..0a4dc9503f8 100644
--- a/cpp/src/IceBT/TransceiverI.cpp
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/TransceiverI.h>
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index 1cad542226d..09650cc8c62 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_TRANSCEIVER_H
diff --git a/cpp/src/IceBT/Util.cpp b/cpp/src/IceBT/Util.cpp
index a24ad2d8c43..f02556ebd42 100644
--- a/cpp/src/IceBT/Util.cpp
+++ b/cpp/src/IceBT/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBT/Util.h>
diff --git a/cpp/src/IceBT/Util.h b/cpp/src/IceBT/Util.h
index fe7dd1a1aa2..777335f34ae 100644
--- a/cpp/src/IceBT/Util.h
+++ b/cpp/src/IceBT/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_BT_UTIL_H
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 734a6ce3123..d92ca632b8d 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp
index cde7417bdc5..414b198117f 100644
--- a/cpp/src/IceBox/Exception.cpp
+++ b/cpp/src/IceBox/Exception.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceBox/IceBox.h>
diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk
index ffeb93d2da4..f1a022dc512 100644
--- a/cpp/src/IceBox/Makefile.mk
+++ b/cpp/src/IceBox/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceBox
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 1e2197bcb8c..8fa8b96649c 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index cba1bba12b5..13b2e2cd550 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index 84ebbe9dafd..a3ea4ca0616 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SERVICE_MANAGER_I_H
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index ae99d2647b4..d0bc8e0d22f 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Connection.h>
diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk
index fc559bed76c..d1361bc0c19 100644
--- a/cpp/src/IceBridge/Makefile.mk
+++ b/cpp/src/IceBridge/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_programs := icebridge
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
index a2cd79e6324..9f67ccca436 100644
--- a/cpp/src/IceDB/IceDB.cpp
+++ b/cpp/src/IceDB/IceDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceDB/IceDB.h>
diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
index 3bc83246d06..6b62054038e 100644
--- a/cpp/src/IceDB/IceDB.h
+++ b/cpp/src/IceDB/IceDB.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_DB_H
diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk
index fa42acbc4d2..bcbd7c8a53a 100644
--- a/cpp/src/IceDB/Makefile.mk
+++ b/cpp/src/IceDB/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries = IceDB
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 5ec2e16b362..9f89a664a6c 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceDiscovery/LocatorI.h>
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index ff3a5542ce8..0aa1361d861 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef LOCATORI_H
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index bbd03d0a989..4640ec1903d 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Connection.h>
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index 9e7a63ab514..5c78dfebbd2 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef LOOKUPI_H
diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk
index 2bbfbdf9052..ae78db9e910 100644
--- a/cpp/src/IceDiscovery/Makefile.mk
+++ b/cpp/src/IceDiscovery/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceDiscovery
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index f4051e3d125..4a2b10b9c4a 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/IceDiscovery/PluginI.h b/cpp/src/IceDiscovery/PluginI.h
index 949bbbaefbe..e85a6a23b37 100644
--- a/cpp/src/IceDiscovery/PluginI.h
+++ b/cpp/src/IceDiscovery/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef PLUGIN_I_H
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 329efbcc67d..590a0dff293 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/ArgVector.h>
diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
index 95f1b4f6a01..56240e96b9b 100644
--- a/cpp/src/IceGrid/Activator.h
+++ b/cpp/src/IceGrid/Activator.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ACTIVATOR_H
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 21d9b294a74..059e7621d56 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 1ec0074f92d..ac3d0265679 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ADAPTERCACHE_H
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp
index 2f21b833c19..f338a5f5dee 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.cpp
+++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/AdminCallbackRouter.h>
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index a7e31c6ffc8..4bab9ce23d6 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 3aea7820408..fedb2684ef7 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 3344b651d4d..013b8873b50 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_I_H
diff --git a/cpp/src/IceGrid/AdminRouter.cpp b/cpp/src/IceGrid/AdminRouter.cpp
index 3c6287ee824..4b19c65a345 100644
--- a/cpp/src/IceGrid/AdminRouter.cpp
+++ b/cpp/src/IceGrid/AdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/AdminRouter.h>
diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h
index 9d6a84cc4b3..63f1cc92fb3 100644
--- a/cpp/src/IceGrid/AdminRouter.h
+++ b/cpp/src/IceGrid/AdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 5ebc3300e82..ac7daf2ab61 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index 69c58dd82f5..e02a0e6a996 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_ADMINSESSIONI_H
diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index 119080c4f3a..2298fe82b8a 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/Allocatable.h>
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index 7068f936943..20d82a23bd4 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLE_H
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index 80d74e37391..d87fe6f4cf6 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
index 83b06043b30..0cd2d2be768 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.h
+++ b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index 39ead9a926c..c614998943d 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_CACHE_H
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 7cc4cd2b0c1..c6243e5acd8 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 34be6a4cca8..45898db72cc 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
index d2363494bce..656012b6633 100644
--- a/cpp/src/IceGrid/Database.h
+++ b/cpp/src/IceGrid/Database.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_DATABASE_H
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 5a6e07ce6fa..0cbed7f794d 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index 35203cdfbda..90d50ef6b42 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 3a04ca88b15..4e80aeff179 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
index 4529d2ae206..6de9017870a 100644
--- a/cpp/src/IceGrid/DescriptorHelper.h
+++ b/cpp/src/IceGrid/DescriptorHelper.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 51c62a41ff1..6da1f347173 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h
index 77ed14f0fb2..32caaf751dc 100644
--- a/cpp/src/IceGrid/DescriptorParser.h
+++ b/cpp/src/IceGrid/DescriptorParser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_DESCRIPTOR_PARSER_H
diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 42407a43693..712eabb5afe 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
index 28dc4bf4949..09cc0fa2c51 100644
--- a/cpp/src/IceGrid/FileCache.h
+++ b/cpp/src/IceGrid/FileCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_FILE_CACHE_H
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp
index 1f8aa8cdd89..3cdec69cf68 100644
--- a/cpp/src/IceGrid/FileParserI.cpp
+++ b/cpp/src/IceGrid/FileParserI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/FileParserI.h>
diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index 75d468a5938..b6c9cd8ebda 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_FILE_PARSERI_H
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
index 75bdcba3f69..3c7a800b858 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
index 67d4368a232..40c95429be9 100644
--- a/cpp/src/IceGrid/FileUserAccountMapperI.h
+++ b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index e6b527c9bd7..6f8f9787d7e 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -70,9 +70,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 942f8ddf00b..31ea16bfa0b 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 41cfdc81755..0524f923a53 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index 94bbac4edc2..3e0e804367e 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 1d0e7511413..2a299523216 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp
index 4095b4aba55..fb3998bcd1b 100644
--- a/cpp/src/IceGrid/InternalRegistryI.cpp
+++ b/cpp/src/IceGrid/InternalRegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h
index 7995d35dcd9..50ec2f4c73d 100644
--- a/cpp/src/IceGrid/InternalRegistryI.h
+++ b/cpp/src/IceGrid/InternalRegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_INTERNALREGISTRYI_H
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index 6f75b3b428c..d7d7d32560a 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 6f9d18581e6..9c23511b17f 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_LOCATOR_I_H
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index 6c3f412113d..da9d70d8506 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index 4e530f3f5bc..ff7ddfebde0 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
index fa5e9c90d10..401f3be40da 100644
--- a/cpp/src/IceGrid/Makefile.mk
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
local_node_srcs = Activator.cpp \
diff --git a/cpp/src/IceGrid/NodeAdminRouter.cpp b/cpp/src/IceGrid/NodeAdminRouter.cpp
index 8d450515cc5..4a77bd960fb 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeAdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/NodeAdminRouter.h>
diff --git a/cpp/src/IceGrid/NodeAdminRouter.h b/cpp/src/IceGrid/NodeAdminRouter.h
index bcfae9a4aff..c613e1ef21b 100644
--- a/cpp/src/IceGrid/NodeAdminRouter.h
+++ b/cpp/src/IceGrid/NodeAdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index c47f2eb627b..98789b954ce 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index 259c3cbf319..6b2a5b3995f 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_NODECACHE_H
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index dcd9769226c..c7dfb898f8a 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Timer.h>
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 2b055d775c6..adc36d2ebff 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_I_H
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index ad22edcb568..145cf9862f1 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h
index af37ffa68e9..3976a4d72e2 100644
--- a/cpp/src/IceGrid/NodeSessionI.h
+++ b/cpp/src/IceGrid/NodeSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_NODE_SESSION_H
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 5ae070db6e9..2cb50e7541a 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 731cbb8d7fb..2b85fec5cbb 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_NODE_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp
index 74f34326b85..5b6f54a4d0b 100644
--- a/cpp/src/IceGrid/ObjectCache.cpp
+++ b/cpp/src/IceGrid/ObjectCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index f4d1693c340..94c84c2ad95 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_OBJECTCACHE_H
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 266247cbdac..5364b51375b 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index cb61c578481..f23adf0bfaa 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_PARSER_H
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index 447e516e13a..bd5c6769dd4 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h
index 82f13680322..e1d018e1c22 100644
--- a/cpp/src/IceGrid/PlatformInfo.h
+++ b/cpp/src/IceGrid/PlatformInfo.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_PLATFORM_INFO_H
diff --git a/cpp/src/IceGrid/PluginFacadeI.cpp b/cpp/src/IceGrid/PluginFacadeI.cpp
index 0a58b600ab1..8d086e5342b 100644
--- a/cpp/src/IceGrid/PluginFacadeI.cpp
+++ b/cpp/src/IceGrid/PluginFacadeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/PluginFacadeI.h>
diff --git a/cpp/src/IceGrid/PluginFacadeI.h b/cpp/src/IceGrid/PluginFacadeI.h
index b58a407aba0..a9b2c7522ba 100644
--- a/cpp/src/IceGrid/PluginFacadeI.h
+++ b/cpp/src/IceGrid/PluginFacadeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_PLUGIN_FACADE_I_H
diff --git a/cpp/src/IceGrid/QueryI.cpp b/cpp/src/IceGrid/QueryI.cpp
index 1e9803c19f0..e5c2555220b 100644
--- a/cpp/src/IceGrid/QueryI.cpp
+++ b/cpp/src/IceGrid/QueryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/Internal.h>
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index a3fd5252ff5..6a9a3a913a1 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_QUERY_I_H
diff --git a/cpp/src/IceGrid/ReapThread.cpp b/cpp/src/IceGrid/ReapThread.cpp
index 99b327fd04b..d7d7d2a2aaf 100644
--- a/cpp/src/IceGrid/ReapThread.cpp
+++ b/cpp/src/IceGrid/ReapThread.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h
index d2e4fcacb5e..ed872adcc66 100644
--- a/cpp/src/IceGrid/ReapThread.h
+++ b/cpp/src/IceGrid/ReapThread.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_REAPER_THREAD_H
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp
index 7b021e30bf7..2ebaa8f4ad7 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.cpp
+++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceGrid/RegistryAdminRouter.h>
diff --git a/cpp/src/IceGrid/RegistryAdminRouter.h b/cpp/src/IceGrid/RegistryAdminRouter.h
index abfebafbbb6..d0961c329ce 100644
--- a/cpp/src/IceGrid/RegistryAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryAdminRouter.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_REGISTRY_ADMIN_ROUTER_H
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 22b456ebfba..a6f4bc797b8 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index c322c0d84fd..18deac3daf5 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_REGISTRYI_H
diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index d3a70a9dadf..b5af05fa2e6 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h
index 35b085a7da5..0e006fa8381 100644
--- a/cpp/src/IceGrid/ReplicaCache.h
+++ b/cpp/src/IceGrid/ReplicaCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_REPLICACACHE_H
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 7a06aeb8990..9d86958fa2d 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h
index 65c9ed28f24..5f30539a046 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.h
+++ b/cpp/src/IceGrid/ReplicaSessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_REPLICA_SESSION_H
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index 1b42e567305..d66fe69b313 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h
index cdc7bd8df50..938fecbab60 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.h
+++ b/cpp/src/IceGrid/ReplicaSessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp
index 8b3d8dae9b0..f07d5fa1ec1 100644
--- a/cpp/src/IceGrid/Scanner.cpp
+++ b/cpp/src/IceGrid/Scanner.cpp
@@ -466,9 +466,6 @@ char *yytext;
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index 6aed3bb88fb..ba71ae83c6f 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index 8ce043300ea..e4a1df463a3 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h
index 9c2c65bf2ce..ee7d9823aaf 100644
--- a/cpp/src/IceGrid/ServerAdapterI.h
+++ b/cpp/src/IceGrid/ServerAdapterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVER_ADAPTER_I_H
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp
index da628a3da02..c9ebc4742a7 100644
--- a/cpp/src/IceGrid/ServerCache.cpp
+++ b/cpp/src/IceGrid/ServerCache.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index bfbe089e32f..373af7bdfc1 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVERCACHE_H
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 6dc187b3723..6ee41505409 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h
index 68d1c8eaab8..5893dd7b9ac 100644
--- a/cpp/src/IceGrid/ServerI.h
+++ b/cpp/src/IceGrid/ServerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_SERVER_I_H
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index 7f2c80afeb8..cb693b56cc1 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index c7c5a9f11ce..631e1dcd176 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_SESSIONI_H
diff --git a/cpp/src/IceGrid/SessionManager.cpp b/cpp/src/IceGrid/SessionManager.cpp
index 2ddd7701eca..eeb01f40204 100644
--- a/cpp/src/IceGrid/SessionManager.cpp
+++ b/cpp/src/IceGrid/SessionManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index beb0bd4d3e1..6c1a6255f13 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_SESSION_MANAGER_H
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index 85f7f00a987..c52890fc7c0 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/UUID.h>
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index 0b8a2cad66b..6dc75971002 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 96298f6aff6..a2cf027f857 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 8f0bef12d34..2d8992fd5b4 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_TOPICS_H
diff --git a/cpp/src/IceGrid/TraceLevels.cpp b/cpp/src/IceGrid/TraceLevels.cpp
index b48e6df59b5..727c7d718e4 100644
--- a/cpp/src/IceGrid/TraceLevels.cpp
+++ b/cpp/src/IceGrid/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h
index 87032e4b24f..4492781290f 100644
--- a/cpp/src/IceGrid/TraceLevels.h
+++ b/cpp/src/IceGrid/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_TRACE_LEVELS_H
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index fffd12f7be6..dc3cddfcccc 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index 92147f28df1..c917bd60923 100644
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_UTIL_H
diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp
index 1bc6fd1a676..988e8092b60 100644
--- a/cpp/src/IceGrid/WaitQueue.cpp
+++ b/cpp/src/IceGrid/WaitQueue.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index f6c11f2ee12..1cea39ce684 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_WAIT_QUEUE_H
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.cpp b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
index 8ecd75474d2..8e13d5abf0a 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.cpp
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Endpoint.h>
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 1458372df26..887fccfea65 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk
index 8919d5a8350..fb35c3ea36a 100644
--- a/cpp/src/IceGridLib/Makefile.mk
+++ b/cpp/src/IceGridLib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceGrid
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 12fd79c8d84..9170d094e26 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICEGRID_API_EXPORTS
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
index faf4ac4fe58..4de39d6e9a2 100644
--- a/cpp/src/IceIAP/Connector.h
+++ b/cpp/src/IceIAP/Connector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IAP_CONNECTOR_H
diff --git a/cpp/src/IceIAP/Connector.mm b/cpp/src/IceIAP/Connector.mm
index 11e3ae07a26..9311cee422f 100644
--- a/cpp/src/IceIAP/Connector.mm
+++ b/cpp/src/IceIAP/Connector.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "Transceiver.h"
diff --git a/cpp/src/IceIAP/EndpointI.h b/cpp/src/IceIAP/EndpointI.h
index 318d1644a1a..65d314e55cc 100644
--- a/cpp/src/IceIAP/EndpointI.h
+++ b/cpp/src/IceIAP/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IAP_ENDPOINT_I_H
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
index 0a1ccee9576..8271778137c 100644
--- a/cpp/src/IceIAP/EndpointI.mm
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "EndpointI.h"
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
index 074326d0727..05bb62b010d 100644
--- a/cpp/src/IceIAP/Makefile.mk
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries = IceIAP
diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h
index eea6c2691e2..6b7c57a2f3c 100644
--- a/cpp/src/IceIAP/Transceiver.h
+++ b/cpp/src/IceIAP/Transceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_IAP_TRANSCEIVER_H
diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm
index e66225faa5e..b711b244017 100644
--- a/cpp/src/IceIAP/Transceiver.mm
+++ b/cpp/src/IceIAP/Transceiver.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "Transceiver.h"
diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk
index f5b5f03e22b..91f08f2d1b1 100644
--- a/cpp/src/IceLocatorDiscovery/Makefile.mk
+++ b/cpp/src/IceLocatorDiscovery/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceLocatorDiscovery
diff --git a/cpp/src/IceLocatorDiscovery/Plugin.h b/cpp/src/IceLocatorDiscovery/Plugin.h
index 62fd5008d93..c8ba472d807 100644
--- a/cpp/src/IceLocatorDiscovery/Plugin.h
+++ b/cpp/src/IceLocatorDiscovery/Plugin.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index e593c5b9225..7f97f8befe8 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index 601aa53e615..3c334e286e6 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index a0f199b6b79..6ed6869a405 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index d136aecc86f..61eeb9f7b3d 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h
index 1550c289e3f..881261bf51b 100644
--- a/cpp/src/IcePatch2/FileServerI.h
+++ b/cpp/src/IcePatch2/FileServerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PATCH2_FILE_SERVER_I_H
diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk
index bfe946233f5..451313dfff2 100644
--- a/cpp/src/IcePatch2/Makefile.mk
+++ b/cpp/src/IcePatch2/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_programs := icepatch2server icepatch2client icepatch2calc
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 0ff2e445226..dbd764a58fb 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 27676ef2afe..0a6c39d7156 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk
index 07fbbcfbaab..06d31352bdc 100644
--- a/cpp/src/IcePatch2Lib/Makefile.mk
+++ b/cpp/src/IcePatch2Lib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IcePatch2
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index da3ce87d6cf..11431fa4335 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
//
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 912f6fe81ea..203f27fe1fa 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_PATCH2_UTIL_H
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 2fd5e1e3759..9882df1bcd2 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/AcceptorI.h>
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index a8df4af547f..cb6316fbb11 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_ACCEPTOR_I_H
diff --git a/cpp/src/IceSSL/CertificateI.cpp b/cpp/src/IceSSL/CertificateI.cpp
index e51185840df..02eaab8c355 100644
--- a/cpp/src/IceSSL/CertificateI.cpp
+++ b/cpp/src/IceSSL/CertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceSSL/CertificateI.h b/cpp/src/IceSSL/CertificateI.h
index 3eb7fddce65..e851d5a24ff 100644
--- a/cpp/src/IceSSL/CertificateI.h
+++ b/cpp/src/IceSSL/CertificateI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_CERTIFICATE_I_H
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 2f62ad191ce..b8d189192fa 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/ConnectorI.h>
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index f048cb8952e..27ec6644c58 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_CONNECTOR_I_H
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index fd932a5826b..cfd1540093f 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/EndpointI.h>
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index cde8675f0e7..ae04a3e6dd7 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_ENDPOINT_I_H
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 55102c9cd5a..0b5079797e4 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Instance.h>
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index d811c7b8b68..0b56c77bc33 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_INSTANCE_H
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index c31a1a943f0..d39f922b126 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_INSTANCE_F_H
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
index c58df8d3f43..1bff174643a 100644
--- a/cpp/src/IceSSL/Makefile.mk
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceSSL
diff --git a/cpp/src/IceSSL/OpenSSLCertificateI.cpp b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
index ffbbdf1c687..712b6b8199d 100644
--- a/cpp/src/IceSSL/OpenSSLCertificateI.cpp
+++ b/cpp/src/IceSSL/OpenSSLCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index bc7ea0b09fd..133d98ee465 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/OpenSSLEngine.h b/cpp/src/IceSSL/OpenSSLEngine.h
index 8c30cca886a..681648dd2ba 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.h
+++ b/cpp/src/IceSSL/OpenSSLEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_H
diff --git a/cpp/src/IceSSL/OpenSSLEngineF.h b/cpp/src/IceSSL/OpenSSLEngineF.h
index 2e1e77ba289..14413751979 100644
--- a/cpp/src/IceSSL/OpenSSLEngineF.h
+++ b/cpp/src/IceSSL/OpenSSLEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 9ab8c313b1f..0ce0b5e0fe2 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index 994d7b98f44..48e0bad02cf 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/OpenSSLTransceiverI.h>
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index fbdcc128cb0..21698549c42 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/OpenSSLUtil.cpp b/cpp/src/IceSSL/OpenSSLUtil.cpp
index 826ee2380dc..513c5e510a2 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/OpenSSLUtil.h>
diff --git a/cpp/src/IceSSL/OpenSSLUtil.h b/cpp/src/IceSSL/OpenSSLUtil.h
index 0d77fd8fd79..c113ee858d5 100644
--- a/cpp/src/IceSSL/OpenSSLUtil.h
+++ b/cpp/src/IceSSL/OpenSSLUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_OPENSSL_UTIL_I_H
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 91876d7baee..10f5e9b26d4 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index 6974e581dd2..50befc27261 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_PLUGIN_I_H
diff --git a/cpp/src/IceSSL/RFC2253.cpp b/cpp/src/IceSSL/RFC2253.cpp
index bffb621b01f..4c1c540a5e6 100644
--- a/cpp/src/IceSSL/RFC2253.cpp
+++ b/cpp/src/IceSSL/RFC2253.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h
index 1b4dfb40fb5..44d9d677bde 100644
--- a/cpp/src/IceSSL/RFC2253.h
+++ b/cpp/src/IceSSL/RFC2253.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_RFC_2253_H
diff --git a/cpp/src/IceSSL/SChannelCertificateI.cpp b/cpp/src/IceSSL/SChannelCertificateI.cpp
index afa3b7d78cc..d817dc61923 100644
--- a/cpp/src/IceSSL/SChannelCertificateI.cpp
+++ b/cpp/src/IceSSL/SChannelCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index ddaa7731b7d..19a50c49631 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/SChannelEngine.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.h b/cpp/src/IceSSL/SChannelEngine.h
index f5db95b23c1..c50e8cb6629 100644
--- a/cpp/src/IceSSL/SChannelEngine.h
+++ b/cpp/src/IceSSL/SChannelEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_H
diff --git a/cpp/src/IceSSL/SChannelEngineF.h b/cpp/src/IceSSL/SChannelEngineF.h
index a68852cf2fa..879daa4d5d1 100644
--- a/cpp/src/IceSSL/SChannelEngineF.h
+++ b/cpp/src/IceSSL/SChannelEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNEL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SChannelPluginI.cpp b/cpp/src/IceSSL/SChannelPluginI.cpp
index b0febdefab1..694615743b3 100644
--- a/cpp/src/IceSSL/SChannelPluginI.cpp
+++ b/cpp/src/IceSSL/SChannelPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index 6716e1c1f5b..b879dab8798 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/SChannelTransceiverI.h>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index 628dafb15e1..c183c6ff8fd 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 2a1b807f270..56e74693671 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/SSLEngine.h>
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index adedc3b2349..57041bc16ad 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_ENGINE_H
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index ecf83afb058..f745756340d 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
index 2d275927553..89a6b6a5b93 100644
--- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp
+++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Plugin.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index 15be667d61a..80f28129bf7 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/SecureTransportEngine.h b/cpp/src/IceSSL/SecureTransportEngine.h
index 71caa78ebd9..a8bdf41d594 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.h
+++ b/cpp/src/IceSSL/SecureTransportEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_H
diff --git a/cpp/src/IceSSL/SecureTransportEngineF.h b/cpp/src/IceSSL/SecureTransportEngineF.h
index 5e5096af388..565c5535c51 100644
--- a/cpp/src/IceSSL/SecureTransportEngineF.h
+++ b/cpp/src/IceSSL/SecureTransportEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_ENGINE_F_H
diff --git a/cpp/src/IceSSL/SecureTransportPluginI.cpp b/cpp/src/IceSSL/SecureTransportPluginI.cpp
index 1ea5713d992..7c4cdc375f3 100644
--- a/cpp/src/IceSSL/SecureTransportPluginI.cpp
+++ b/cpp/src/IceSSL/SecureTransportPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index fcd76e80d2d..317da13705b 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/SecureTransportTransceiverI.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index 677a110c31c..f3d84ef033b 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/SecureTransportUtil.cpp b/cpp/src/IceSSL/SecureTransportUtil.cpp
index f1ce4cd93dd..ac8d8f21e34 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.cpp
+++ b/cpp/src/IceSSL/SecureTransportUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/SecureTransportUtil.h>
diff --git a/cpp/src/IceSSL/SecureTransportUtil.h b/cpp/src/IceSSL/SecureTransportUtil.h
index 89f402ab00d..211d4b49c9c 100644
--- a/cpp/src/IceSSL/SecureTransportUtil.h
+++ b/cpp/src/IceSSL/SecureTransportUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
diff --git a/cpp/src/IceSSL/TrustManager.cpp b/cpp/src/IceSSL/TrustManager.cpp
index eba463f85a5..8f2352b70c6 100644
--- a/cpp/src/IceSSL/TrustManager.cpp
+++ b/cpp/src/IceSSL/TrustManager.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/TrustManager.h>
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index 126ede4d916..ce9ba4d42dd 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_H
diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h
index 0d01d3fbde9..ec11874eadd 100644
--- a/cpp/src/IceSSL/TrustManagerF.h
+++ b/cpp/src/IceSSL/TrustManagerF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_TRUST_MANAGER_F_H
diff --git a/cpp/src/IceSSL/UWPCertificateI.cpp b/cpp/src/IceSSL/UWPCertificateI.cpp
index f2711a2c17b..b5108e7bc23 100644
--- a/cpp/src/IceSSL/UWPCertificateI.cpp
+++ b/cpp/src/IceSSL/UWPCertificateI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
//
diff --git a/cpp/src/IceSSL/UWPEngine.cpp b/cpp/src/IceSSL/UWPEngine.cpp
index 4dece71132b..f3be970d81b 100644
--- a/cpp/src/IceSSL/UWPEngine.cpp
+++ b/cpp/src/IceSSL/UWPEngine.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPEngine.h b/cpp/src/IceSSL/UWPEngine.h
index e0be122f085..701590131e4 100644
--- a/cpp/src/IceSSL/UWPEngine.h
+++ b/cpp/src/IceSSL/UWPEngine.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_H
diff --git a/cpp/src/IceSSL/UWPEngineF.h b/cpp/src/IceSSL/UWPEngineF.h
index 82db9059afc..634f0c594d8 100644
--- a/cpp/src/IceSSL/UWPEngineF.h
+++ b/cpp/src/IceSSL/UWPEngineF.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_UWP_ENGINE_F_H
diff --git a/cpp/src/IceSSL/UWPPluginI.cpp b/cpp/src/IceSSL/UWPPluginI.cpp
index fd6c9e2cfd7..a1d519496ba 100644
--- a/cpp/src/IceSSL/UWPPluginI.cpp
+++ b/cpp/src/IceSSL/UWPPluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/PluginI.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp
index e12da8bdafd..50cc865ff0f 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.cpp
+++ b/cpp/src/IceSSL/UWPTransceiverI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceSSL/Config.h>
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 6181400af28..272356c51be 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_UWP_TRANSCEIVER_I_H
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index 269d8269ba5..f919115613b 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 7f5c3ef70ab..62b60e6598a 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESSL_UTIL_H
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 4f4bf9aef66..875ac412e36 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice
index ecdd4481632..08dc5d22510 100644
--- a/cpp/src/IceStorm/DBTypes.ice
+++ b/cpp/src/IceStorm/DBTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice
index 1ffc2a9e9f5..8a7c47e558c 100644
--- a/cpp/src/IceStorm/Election.ice
+++ b/cpp/src/IceStorm/Election.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Grammar.cpp b/cpp/src/IceStorm/Grammar.cpp
index 7db49139955..aafd24e8559 100644
--- a/cpp/src/IceStorm/Grammar.cpp
+++ b/cpp/src/IceStorm/Grammar.cpp
@@ -70,9 +70,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index 8906ee64866..d60b83fccbf 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index cbeec576535..2cf9398428c 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice
index cdf73088b24..7f9d6ace1c0 100644
--- a/cpp/src/IceStorm/IceStormInternal.ice
+++ b/cpp/src/IceStorm/IceStormInternal.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index 1cbf85f74e6..f65d83f8353 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/Instance.h>
diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h
index fa55815130b..19e9555327c 100644
--- a/cpp/src/IceStorm/Instance.h
+++ b/cpp/src/IceStorm/Instance.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INSTANCE_H
diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice
index bb78f850f72..3dca295be82 100644
--- a/cpp/src/IceStorm/Instrumentation.ice
+++ b/cpp/src/IceStorm/Instrumentation.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index 2cd1070810f..ded07c9a8b6 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/InstrumentationI.h>
diff --git a/cpp/src/IceStorm/InstrumentationI.h b/cpp/src/IceStorm/InstrumentationI.h
index 81e8e78f3de..1f4b62504df 100644
--- a/cpp/src/IceStorm/InstrumentationI.h
+++ b/cpp/src/IceStorm/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index a69f2b1bfac..35b27b0542e 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice
index 0e15ced26bc..0090a56f4a3 100644
--- a/cpp/src/IceStorm/LinkRecord.ice
+++ b/cpp/src/IceStorm/LinkRecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk
index 42ae54a5bee..32a8b9a66fc 100644
--- a/cpp/src/IceStorm/Makefile.mk
+++ b/cpp/src/IceStorm/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceStormService
diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index da8c134e7c1..d87482bc5e6 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h
index 73373ddae00..9c3ca39a79d 100644
--- a/cpp/src/IceStorm/NodeI.h
+++ b/cpp/src/IceStorm/NodeI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ELECTION_I_H
diff --git a/cpp/src/IceStorm/Observers.cpp b/cpp/src/IceStorm/Observers.cpp
index 4ffb95d7129..72dc9df1020 100644
--- a/cpp/src/IceStorm/Observers.cpp
+++ b/cpp/src/IceStorm/Observers.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/Observers.h>
diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h
index 9e89ac3ea0f..c98d0e44eff 100644
--- a/cpp/src/IceStorm/Observers.h
+++ b/cpp/src/IceStorm/Observers.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef OBSERVERS_H
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 41ff1c35076..9b97c180983 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index fb99fd7df27..a696a4fe012 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STORM_PARSER_H
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index 30bc6f13065..e0af5e778d6 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef REPLICA_H
diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp
index bd614c44465..fa6ad378a91 100644
--- a/cpp/src/IceStorm/Scanner.cpp
+++ b/cpp/src/IceStorm/Scanner.cpp
@@ -466,9 +466,6 @@ char *yytext;
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index 7b6f104a28d..47cd435feee 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index e4a4c1b5d3b..3beb25d9ab2 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#define ICESTORM_SERVICE_API_EXPORTS
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index acd430ab3ef..a9991943395 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICESTORM_SERVICE_H
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 7c2d298aabc..cbc9aa03df6 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/Subscriber.h>
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index c712b9f37c7..e9d3ebc6f67 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SUBSCRIBER_H
diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice
index 84e34b08ab7..98dd9dd6cf0 100644
--- a/cpp/src/IceStorm/SubscriberRecord.ice
+++ b/cpp/src/IceStorm/SubscriberRecord.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index d3a5dbdf5be..269f9ab955a 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/TopicI.h>
diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h
index 0b5de5cd8bc..be48eea9cfd 100644
--- a/cpp/src/IceStorm/TopicI.h
+++ b/cpp/src/IceStorm/TopicI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TOPIC_I_H
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index b5080794b62..7e9d10890f6 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/TopicManagerI.h>
diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h
index 18056ae6f40..3a913082363 100644
--- a/cpp/src/IceStorm/TopicManagerI.h
+++ b/cpp/src/IceStorm/TopicManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index d14f9c3887f..f0ee042b89b 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/TraceLevels.h>
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 78a0dfe3c34..91f0d1e5903 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_STORM_TRACE_LEVELS_H
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 0b89d7d5a2d..014029a58bd 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/TransientTopicI.h>
diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h
index 4a1b0bc78c8..da745330e7c 100644
--- a/cpp/src/IceStorm/TransientTopicI.h
+++ b/cpp/src/IceStorm/TransientTopicI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TRANSIENT_TOPIC_I_H
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 7163d3464ae..2e33a7ce8d2 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/TransientTopicManagerI.h>
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h
index a2f554cb478..49e617abb27 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.h
+++ b/cpp/src/IceStorm/TransientTopicManagerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TRANSIENT_TOPIC_MANAGER_I_H
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
index bc55a19cf93..3d17d1d5a49 100644
--- a/cpp/src/IceStorm/Util.cpp
+++ b/cpp/src/IceStorm/Util.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceStorm/Util.h>
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index 706fc4a623f..d70943fb929 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef UTIL_H
diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk
index 468a1cd661e..317510ab5af 100644
--- a/cpp/src/IceStormLib/Makefile.mk
+++ b/cpp/src/IceStormLib/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceStorm
diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp
index 87ad7d8295c..fd1f5855e02 100644
--- a/cpp/src/IceUtil/ConsoleUtil.cpp
+++ b/cpp/src/IceUtil/ConsoleUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp
index 2df27dc04e9..16fe10d14f5 100644
--- a/cpp/src/IceUtil/ConvertUTF.cpp
+++ b/cpp/src/IceUtil/ConvertUTF.cpp
@@ -24,9 +24,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
/* ---------------------------------------------------------------------
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h
index 0baee6635ed..5aa3f7df4d8 100644
--- a/cpp/src/IceUtil/ConvertUTF.h
+++ b/cpp/src/IceUtil/ConvertUTF.h
@@ -24,9 +24,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_CONVERT_UTF_H
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index d45807afe18..d0de08a6365 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef __sun
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index ed20da80f3b..7a0d8a66cfd 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index 901f06eadac..f3dd98922c3 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/InputUtil.h>
diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk
index 4014a3b05a3..2f031256d36 100644
--- a/cpp/src/IceUtil/Makefile.mk
+++ b/cpp/src/IceUtil/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries = IceUtil
diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp
index cd2ee330a12..fc278555666 100644
--- a/cpp/src/IceUtil/MutexProtocol.cpp
+++ b/cpp/src/IceUtil/MutexProtocol.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/MutexProtocol.h>
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index bda73d5c7ad..7baf57380f2 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index e152dac98f0..9003b8e93fa 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/OutputUtil.h>
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index e7b078f87f7..bcf2b233ad3 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef _WIN32
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 67cb25f8f12..24465292486 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/RecMutex.h>
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 15736067ff1..6250f1ab8bd 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Shared.h>
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index d9e862afba4..292f87d5fc4 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringConverter.h>
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 42e2637a320..33848ba54cd 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 5079a867b84..8f047847146 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/ThreadException.h>
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 784752a8373..68b953dbb2a 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index d6a4f00f9f1..662807a86f2 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/UUID.h>
diff --git a/cpp/src/IceUtil/Unicode.cpp b/cpp/src/IceUtil/Unicode.cpp
index a49f3ad2b39..608d6306de4 100644
--- a/cpp/src/IceUtil/Unicode.cpp
+++ b/cpp/src/IceUtil/Unicode.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Config.h>
diff --git a/cpp/src/IceUtil/Unicode.h b/cpp/src/IceUtil/Unicode.h
index c675a076a4a..bdae437a5a4 100644
--- a/cpp/src/IceUtil/Unicode.h
+++ b/cpp/src/IceUtil/Unicode.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_UTIL_UNICODE_H
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp
index 52b5b48e9c7..4c8daaaf236 100644
--- a/cpp/src/IceUtil/UtilException.cpp
+++ b/cpp/src/IceUtil/UtilException.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#if defined(_MSC_VER) && _MSC_VER >= 1700
diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk
index d71e17999e0..c6b9315c6ca 100644
--- a/cpp/src/IceXML/Makefile.mk
+++ b/cpp/src/IceXML/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := IceXML
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 4512ccf19ce..1a1ad3e8c41 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceXML/Parser.h>
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index 7de07a1d0d8..4ee32ea78b8 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_XML_PARSER_H
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 0b2169ee553..7d63961a941 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/CPlusPlusUtil.h>
@@ -519,9 +516,6 @@ Slice::printHeader(Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/CPlusPlusUtil.h b/cpp/src/Slice/CPlusPlusUtil.h
index accc29a680c..ac77f16f86a 100644
--- a/cpp/src/Slice/CPlusPlusUtil.h
+++ b/cpp/src/Slice/CPlusPlusUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef C_PLUS_PLUS_UTIL_H
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index 078465648c4..d35fda1c921 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/Checksum.h>
diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h
index 6476855fe29..ef86fc5784d 100644
--- a/cpp/src/Slice/Checksum.h
+++ b/cpp/src/Slice/Checksum.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_CHECKSUM_H
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index c73dc6f96eb..17eeefd1f2e 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/FileTracker.h>
diff --git a/cpp/src/Slice/FileTracker.h b/cpp/src/Slice/FileTracker.h
index 0a2ce45735d..704004f9e6a 100644
--- a/cpp/src/Slice/FileTracker.h
+++ b/cpp/src/Slice/FileTracker.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef FILE_TRACKER_H
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index b45d8bc36a3..d9ef1669a98 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -77,9 +77,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h>
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 4874116b2b8..8c5776c78e2 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h>
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index f70328604b1..5ea716dbaae 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_GRAMMAR_UTIL_H
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index e7ffced4c50..3e81077a3ff 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
@@ -792,9 +789,6 @@ Slice::JavaOutput::printHeader()
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h
index 8f2cbd98bcd..8fdbeb38a51 100644
--- a/cpp/src/Slice/JavaUtil.h
+++ b/cpp/src/Slice/JavaUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef JAVA_UTIL_H
diff --git a/cpp/src/Slice/MD5.cpp b/cpp/src/Slice/MD5.cpp
index 94704831141..d11ee1724c8 100644
--- a/cpp/src/Slice/MD5.cpp
+++ b/cpp/src/Slice/MD5.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/MD5.h>
diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h
index 4f0fa907d28..4314dfb68d0 100644
--- a/cpp/src/Slice/MD5.h
+++ b/cpp/src/Slice/MD5.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_MD5_H
diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk
index 55886bb4ed0..83a0bb90a0d 100644
--- a/cpp/src/Slice/Makefile.mk
+++ b/cpp/src/Slice/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries := Slice
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp
index db20c8f24aa..e6b31290a59 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/Slice/PHPUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/PHPUtil.h>
diff --git a/cpp/src/Slice/PHPUtil.h b/cpp/src/Slice/PHPUtil.h
index 7b68a09b107..ac61a0a6232 100644
--- a/cpp/src/Slice/PHPUtil.h
+++ b/cpp/src/Slice/PHPUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_PHP_UTIL_H
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 6a8d54d474f..a2ad348fb17 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index 94b2a4910eb..a36bd1154e5 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_PARSER_H
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 0a40f3bc128..35e4deeb89f 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/Preprocessor.h>
diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h
index 844439c020e..b2130800f58 100644
--- a/cpp/src/Slice/Preprocessor.h
+++ b/cpp/src/Slice/Preprocessor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef PREPROCESSOR_H
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index bb1071583b4..c94ddfa212b 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index 5d85d998919..55314440dd6 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/PythonUtil.h>
@@ -3092,9 +3089,6 @@ Slice::Python::printHeader(IceUtilInternal::Output& out)
"#\n"
"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
-"#\n"
"# **********************************************************************\n"
;
diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h
index 0cfc70e7bd2..2dc69c1cc62 100644
--- a/cpp/src/Slice/PythonUtil.h
+++ b/cpp/src/Slice/PythonUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_PYTHON_UTIL_H
diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp
index d3d64114013..5e3b5ef2345 100644
--- a/cpp/src/Slice/Ruby.cpp
+++ b/cpp/src/Slice/Ruby.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 0914cc8913c..6ec56cb5bb5 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/RubyUtil.h>
@@ -1568,9 +1565,6 @@ Slice::Ruby::printHeader(IceUtilInternal::Output& out)
"#\n"
"# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
-"#\n"
"# **********************************************************************\n"
;
diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h
index 5bb79546b26..69ad8f937e8 100644
--- a/cpp/src/Slice/RubyUtil.h
+++ b/cpp/src/Slice/RubyUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_RUBY_UTIL_H
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index d451e7054ff..6a0ba098cd8 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -550,9 +550,6 @@ char *slice_text;
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 52480c2c198..8209d01265b 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -4,9 +4,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/GrammarUtil.h> // Before Grammer.h, so that YYSTYPE is defined
diff --git a/cpp/src/Slice/SliceUtil.cpp b/cpp/src/Slice/SliceUtil.cpp
index 84f5573f547..f59a58818dd 100644
--- a/cpp/src/Slice/SliceUtil.cpp
+++ b/cpp/src/Slice/SliceUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp
index bada507a486..f2f1dd8a74c 100644
--- a/cpp/src/Slice/StringLiteralUtil.cpp
+++ b/cpp/src/Slice/StringLiteralUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/Util.h>
diff --git a/cpp/src/Slice/Util.h b/cpp/src/Slice/Util.h
index 3aa09be3c76..caa8ed321bb 100644
--- a/cpp/src/Slice/Util.h
+++ b/cpp/src/Slice/Util.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLICE_UTIL_H
diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index 5625baf75d1..e24fbf7c2ed 100644
--- a/cpp/src/icegriddb/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index ad8cb8858d9..b2b96f44688 100644
--- a/cpp/src/icegriddb/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
index 09d7fb36c78..2635bca3b22 100644
--- a/cpp/src/icegriddb/Makefile.mk
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_programs := icegriddb
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp
index d841d437201..9e5b8890412 100644
--- a/cpp/src/iceserviceinstall/Install.cpp
+++ b/cpp/src/iceserviceinstall/Install.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index b1bccccfb8c..d42540093f9 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServiceInstaller.h>
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h
index 236871ec481..78f181e9671 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.h
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ICE_SERVICE_INSTALLER_H
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index 1bf7705f1fe..81bc2488c5e 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/ConsoleUtil.h>
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 36b77745e06..912a1bc5262 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CONFLUENCE_OUTPUT
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index f54207be8fa..ac492c8d47b 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/FileUtil.h>
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index ec7daebd409..b85854ef7c3 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index 061f0f2155c..f727095a663 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 8bbf1aa21ca..e0e49484a69 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "Gen.h"
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 320e5e81412..592b0efd785 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 9b317ec6757..f6229dcbb44 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 887b1223fb4..4e855c42673 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -3,9 +3,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <CsUtil.h>
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
index 128fffd5931..c814fe311b3 100644
--- a/cpp/src/slice2cs/CsUtil.h
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CS_UTIL_H
diff --git a/cpp/src/slice2cs/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 713cd939244..88e102695d8 100644
--- a/cpp/src/slice2cs/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <DotNetNames.h>
diff --git a/cpp/src/slice2cs/DotNetNames.h b/cpp/src/slice2cs/DotNetNames.h
index 86051d70d66..33ea863ac9b 100644
--- a/cpp/src/slice2cs/DotNetNames.h
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef DOTNETNAMES_H
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index aa83ea80653..5fd2d18e11e 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
@@ -2121,9 +2118,6 @@ Slice::Gen::printHeader()
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index dec6da394b3..b56de95fb65 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index cb89c6032fe..e5a43892c82 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 7f01cdc645c..416349e991a 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 518153cb93b..923c83f480a 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index c0b76fa5461..c7d24550e36 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 9bcb876e192..1bd2f742d6b 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Gen.h>
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 2da076ecbf7..4608a974b8b 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index b24b89e5eca..95ce5cf9b27 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <GenCompat.h>
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index ea2a43a74bd..796d5332a58 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_COMPAT_H
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 48f61322858..171012dd7f7 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 56478dc9137..d0d80e9ddbd 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Functional.h>
@@ -97,9 +94,6 @@ printHeader(IceUtilInternal::Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// This copy of Ice is licensed to you under the terms described in the\n"
- "// ICE_LICENSE file included in this distribution.\n"
- "//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index 83dfc942fdf..6ca2a1df8ec 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 0f02ee20547..a5084be9160 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <JsUtil.h>
diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h
index 0f2be61e9e0..f8ae5400b57 100644
--- a/cpp/src/slice2js/JsUtil.h
+++ b/cpp/src/slice2js/JsUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef JS_UTIL_H
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 6b1264dbe75..9abb2ce7cc6 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 107d0e9f6a8..98556847c02 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index fad745abc8f..75133d6f0a1 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
@@ -885,9 +882,6 @@ Slice::Gen::printHeader(Output& o)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
-"// This copy of Ice is licensed to you under the terms described in the\n"
-"// ICE_LICENSE file included in this distribution.\n"
-"//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index a9c7d49f520..b347331c1f5 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef GEN_H
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index 4c776ba7153..064ffadff88 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Options.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 45ead2ea1eb..3c323c52da6 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ObjCUtil.h>
diff --git a/cpp/src/slice2objc/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index fcef6f7a874..64a58a1eeae 100644
--- a/cpp/src/slice2objc/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef OBJC_UTIL_H
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 7ef95d0da0e..12900e41943 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/CtrlCHandler.h>
@@ -1582,9 +1579,6 @@ printHeader(IceUtilInternal::Output& out)
"//\n"
"// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.\n"
"//\n"
- "// This copy of Ice is licensed to you under the terms described in the\n"
- "// ICE_LICENSE file included in this distribution.\n"
- "//\n"
"// **********************************************************************\n"
;
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index c523748501e..cf34e8cf4ec 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/PythonUtil.h>
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index b879c74f126..167c5bdaa39 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Slice/RubyUtil.h>
diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk
index a32d123e283..81dcf84fcec 100644
--- a/cpp/test/Common/Makefile.mk
+++ b/cpp/test/Common/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_libraries = TestCommon
diff --git a/cpp/test/Common/TestHelper.cpp b/cpp/test/Common/TestHelper.cpp
index a30716f5091..7132212afec 100644
--- a/cpp/test/Common/TestHelper.cpp
+++ b/cpp/test/Common/TestHelper.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestHelper.h>
diff --git a/cpp/test/Glacier2/application/Callback.ice b/cpp/test/Glacier2/application/Callback.ice
index af7b70e1a11..31a809f526c 100644
--- a/cpp/test/Glacier2/application/Callback.ice
+++ b/cpp/test/Glacier2/application/Callback.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp
index a0390c151f2..52e96a3bd14 100644
--- a/cpp/test/Glacier2/application/Client.cpp
+++ b/cpp/test/Glacier2/application/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/application/Makefile.mk b/cpp/test/Glacier2/application/Makefile.mk
index 5a3384d2c81..d96e8f5da5c 100644
--- a/cpp/test/Glacier2/application/Makefile.mk
+++ b/cpp/test/Glacier2/application/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp Callback.ice
diff --git a/cpp/test/Glacier2/application/Server.cpp b/cpp/test/Glacier2/application/Server.cpp
index ce063835c22..93ad30b1a20 100644
--- a/cpp/test/Glacier2/application/Server.cpp
+++ b/cpp/test/Glacier2/application/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/attack/Backend.ice b/cpp/test/Glacier2/attack/Backend.ice
index e7b134af4f6..c59dddf09ad 100644
--- a/cpp/test/Glacier2/attack/Backend.ice
+++ b/cpp/test/Glacier2/attack/Backend.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/attack/BackendI.cpp b/cpp/test/Glacier2/attack/BackendI.cpp
index 6609471f4b8..baaeeadb5fc 100644
--- a/cpp/test/Glacier2/attack/BackendI.cpp
+++ b/cpp/test/Glacier2/attack/BackendI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/attack/BackendI.h b/cpp/test/Glacier2/attack/BackendI.h
index 980718a8c49..f25e6c12799 100644
--- a/cpp/test/Glacier2/attack/BackendI.h
+++ b/cpp/test/Glacier2/attack/BackendI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BACKEND_I_H
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index 30efb3651aa..7a6c4a765ba 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/test/Glacier2/attack/Makefile.mk b/cpp/test/Glacier2/attack/Makefile.mk
index a362e4ecbe3..70c2c54f5a3 100644
--- a/cpp/test/Glacier2/attack/Makefile.mk
+++ b/cpp/test/Glacier2/attack/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp
index 282368f57bd..9622c73a684 100644
--- a/cpp/test/Glacier2/attack/Server.cpp
+++ b/cpp/test/Glacier2/attack/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/attack/test.py b/cpp/test/Glacier2/attack/test.py
index 4e5813f5a93..ac7bacae855 100644
--- a/cpp/test/Glacier2/attack/test.py
+++ b/cpp/test/Glacier2/attack/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
Glacier2TestSuite(__name__, routerProps = { "Glacier2.RoutingTable.MaxSize" : 10 })
diff --git a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
index deac9459166..9506851b99e 100644
--- a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/BackendI.h b/cpp/test/Glacier2/dynamicFiltering/BackendI.h
index b1c5c742bb2..aea247656df 100644
--- a/cpp/test/Glacier2/dynamicFiltering/BackendI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/BackendI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BACKEND_I_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index 9f756fd5bf0..37494cf179a 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
index 2649aa70165..2083403f867 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
+++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = Glacier2 Ice TestCommon
diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
index 96ede8d44fb..8483183b76f 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
index 930a3362759..41df60f37a1 100644
--- a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.h b/cpp/test/Glacier2/dynamicFiltering/SessionI.h
index 2a306ef6235..882aa77baad 100644
--- a/cpp/test/Glacier2/dynamicFiltering/SessionI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SESSION_I_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/Test.ice b/cpp/test/Glacier2/dynamicFiltering/Test.ice
index 4f5cbb0fa0c..b5bb31fc2ba 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Test.ice
+++ b/cpp/test/Glacier2/dynamicFiltering/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
index 6b3d2306c30..bf3dccd8d2c 100644
--- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
index 95c4e56532b..4a06d7d9785 100644
--- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
+++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_CONTROLLER_H
diff --git a/cpp/test/Glacier2/dynamicFiltering/test.py b/cpp/test/Glacier2/dynamicFiltering/test.py
index b71280d567e..73de5147cc4 100644
--- a/cpp/test/Glacier2/dynamicFiltering/test.py
+++ b/cpp/test/Glacier2/dynamicFiltering/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/Glacier2/hashpassword/test.py b/cpp/test/Glacier2/hashpassword/test.py
index 4f34f87e321..cdf6881ed60 100644
--- a/cpp/test/Glacier2/hashpassword/test.py
+++ b/cpp/test/Glacier2/hashpassword/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class Glacier2HashPasswordTestCase(ClientTestCase):
diff --git a/cpp/test/Glacier2/override/Callback.ice b/cpp/test/Glacier2/override/Callback.ice
index aff3bced45b..963607d1b80 100644
--- a/cpp/test/Glacier2/override/Callback.ice
+++ b/cpp/test/Glacier2/override/Callback.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/override/CallbackI.cpp b/cpp/test/Glacier2/override/CallbackI.cpp
index 4e5b7a71ce2..2d06f4ea50b 100644
--- a/cpp/test/Glacier2/override/CallbackI.cpp
+++ b/cpp/test/Glacier2/override/CallbackI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/override/CallbackI.h b/cpp/test/Glacier2/override/CallbackI.h
index 1f028265098..e14f0af2569 100644
--- a/cpp/test/Glacier2/override/CallbackI.h
+++ b/cpp/test/Glacier2/override/CallbackI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CALLBACK_I_H
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp
index 09f4fc5bce0..6000ce33b34 100644
--- a/cpp/test/Glacier2/override/Client.cpp
+++ b/cpp/test/Glacier2/override/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/override/Makefile.mk b/cpp/test/Glacier2/override/Makefile.mk
index 5f1033ec16c..75d21ccdaaf 100644
--- a/cpp/test/Glacier2/override/Makefile.mk
+++ b/cpp/test/Glacier2/override/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
diff --git a/cpp/test/Glacier2/override/Server.cpp b/cpp/test/Glacier2/override/Server.cpp
index 13519c2f8c2..6d2fb59713f 100644
--- a/cpp/test/Glacier2/override/Server.cpp
+++ b/cpp/test/Glacier2/override/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/override/test.py b/cpp/test/Glacier2/override/test.py
index 9c63c10b571..436df6e3a2b 100644
--- a/cpp/test/Glacier2/override/test.py
+++ b/cpp/test/Glacier2/override/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/Glacier2/router/Callback.ice b/cpp/test/Glacier2/router/Callback.ice
index 1492c853b02..6761dc5d965 100644
--- a/cpp/test/Glacier2/router/Callback.ice
+++ b/cpp/test/Glacier2/router/Callback.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/router/CallbackI.cpp b/cpp/test/Glacier2/router/CallbackI.cpp
index 8a2e52d4dc5..37b931b1ff9 100644
--- a/cpp/test/Glacier2/router/CallbackI.cpp
+++ b/cpp/test/Glacier2/router/CallbackI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/router/CallbackI.h b/cpp/test/Glacier2/router/CallbackI.h
index 2c68bfbd4e2..c9b503fa039 100644
--- a/cpp/test/Glacier2/router/CallbackI.h
+++ b/cpp/test/Glacier2/router/CallbackI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CALLBACK_I_H
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 27e8dc3ca78..4dac1978b43 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/test/Glacier2/router/Makefile.mk b/cpp/test/Glacier2/router/Makefile.mk
index 5f1033ec16c..75d21ccdaaf 100644
--- a/cpp/test/Glacier2/router/Makefile.mk
+++ b/cpp/test/Glacier2/router/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice
diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp
index d983f281789..7138278c7ef 100644
--- a/cpp/test/Glacier2/router/Server.cpp
+++ b/cpp/test/Glacier2/router/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index daa62369221..d66a0df828e 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mk b/cpp/test/Glacier2/sessionControl/Makefile.mk
index 7eea1618f5e..09a3be879e5 100644
--- a/cpp/test/Glacier2/sessionControl/Makefile.mk
+++ b/cpp/test/Glacier2/sessionControl/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = Glacier2 Ice TestCommon
diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp
index 95a9a6d49fb..ca7a69f13a8 100644
--- a/cpp/test/Glacier2/sessionControl/Server.cpp
+++ b/cpp/test/Glacier2/sessionControl/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/sessionControl/Session.ice b/cpp/test/Glacier2/sessionControl/Session.ice
index 7f209b0c9e3..237b9a03531 100644
--- a/cpp/test/Glacier2/sessionControl/Session.ice
+++ b/cpp/test/Glacier2/sessionControl/Session.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/sessionControl/SessionI.cpp b/cpp/test/Glacier2/sessionControl/SessionI.cpp
index 759f6766df3..cb6d8716c6a 100644
--- a/cpp/test/Glacier2/sessionControl/SessionI.cpp
+++ b/cpp/test/Glacier2/sessionControl/SessionI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/sessionControl/SessionI.h b/cpp/test/Glacier2/sessionControl/SessionI.h
index 59ced229e48..88e295468e2 100644
--- a/cpp/test/Glacier2/sessionControl/SessionI.h
+++ b/cpp/test/Glacier2/sessionControl/SessionI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SESSION_I_H
diff --git a/cpp/test/Glacier2/sessionControl/test.py b/cpp/test/Glacier2/sessionControl/test.py
index 4f59decdced..8aa036c782a 100644
--- a/cpp/test/Glacier2/sessionControl/test.py
+++ b/cpp/test/Glacier2/sessionControl/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/Glacier2/sessionHelper/Callback.ice b/cpp/test/Glacier2/sessionHelper/Callback.ice
index a912d14d399..235566777ad 100644
--- a/cpp/test/Glacier2/sessionHelper/Callback.ice
+++ b/cpp/test/Glacier2/sessionHelper/Callback.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 19f933aa8dd..e8e5f9eadbc 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/sessionHelper/Makefile.mk b/cpp/test/Glacier2/sessionHelper/Makefile.mk
index 5a3384d2c81..d96e8f5da5c 100644
--- a/cpp/test/Glacier2/sessionHelper/Makefile.mk
+++ b/cpp/test/Glacier2/sessionHelper/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp Callback.ice
diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp
index 4f2b58c43bf..c454afde95b 100644
--- a/cpp/test/Glacier2/sessionHelper/Server.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index 65e3a5bc526..ea5e6b4ee3a 100644
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/ssl/Makefile.mk b/cpp/test/Glacier2/ssl/Makefile.mk
index bc7a5c5e7e2..03a5d38c669 100644
--- a/cpp/test/Glacier2/ssl/Makefile.mk
+++ b/cpp/test/Glacier2/ssl/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_dependencies = Glacier2
diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp
index 971b3789991..a3c59a304dc 100644
--- a/cpp/test/Glacier2/ssl/Server.cpp
+++ b/cpp/test/Glacier2/ssl/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/ssl/test.py b/cpp/test/Glacier2/ssl/test.py
index 755f93eaacd..8eed2d1f7c7 100644
--- a/cpp/test/Glacier2/ssl/test.py
+++ b/cpp/test/Glacier2/ssl/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
routerProps = lambda process, current : {
diff --git a/cpp/test/Glacier2/staticFiltering/Backend.ice b/cpp/test/Glacier2/staticFiltering/Backend.ice
index e7b134af4f6..c59dddf09ad 100644
--- a/cpp/test/Glacier2/staticFiltering/Backend.ice
+++ b/cpp/test/Glacier2/staticFiltering/Backend.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Glacier2/staticFiltering/BackendI.cpp b/cpp/test/Glacier2/staticFiltering/BackendI.cpp
index 6609471f4b8..baaeeadb5fc 100644
--- a/cpp/test/Glacier2/staticFiltering/BackendI.cpp
+++ b/cpp/test/Glacier2/staticFiltering/BackendI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/staticFiltering/BackendI.h b/cpp/test/Glacier2/staticFiltering/BackendI.h
index 980718a8c49..f25e6c12799 100644
--- a/cpp/test/Glacier2/staticFiltering/BackendI.h
+++ b/cpp/test/Glacier2/staticFiltering/BackendI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BACKEND_I_H
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 66952372dce..7063fadfc8b 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mk b/cpp/test/Glacier2/staticFiltering/Makefile.mk
index a362e4ecbe3..70c2c54f5a3 100644
--- a/cpp/test/Glacier2/staticFiltering/Makefile.mk
+++ b/cpp/test/Glacier2/staticFiltering/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice
diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp
index e4561d76cf3..e614396633a 100644
--- a/cpp/test/Glacier2/staticFiltering/Server.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Glacier2/staticFiltering/test.py b/cpp/test/Glacier2/staticFiltering/test.py
index 8808e250ef4..762de66e8bf 100644
--- a/cpp/test/Glacier2/staticFiltering/test.py
+++ b/cpp/test/Glacier2/staticFiltering/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import os
diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp
index 9e4e87e92cb..30d8faebfba 100644
--- a/cpp/test/Ice/acm/AllTests.cpp
+++ b/cpp/test/Ice/acm/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp
index 68925117735..9df3dd42b5c 100644
--- a/cpp/test/Ice/acm/Client.cpp
+++ b/cpp/test/Ice/acm/Client.cpp
@@ -1,9 +1,6 @@
// **********************************************************************
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp
index 34d0819b3d0..ec15591059d 100644
--- a/cpp/test/Ice/acm/Server.cpp
+++ b/cpp/test/Ice/acm/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/acm/Test.ice b/cpp/test/Ice/acm/Test.ice
index cb6ba637ec1..b68c5f3bffe 100644
--- a/cpp/test/Ice/acm/Test.ice
+++ b/cpp/test/Ice/acm/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp
index aeb447b2fa8..7561d9ed8f0 100644
--- a/cpp/test/Ice/acm/TestI.cpp
+++ b/cpp/test/Ice/acm/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h
index 1fe7b6ab037..8b09480b41e 100644
--- a/cpp/test/Ice/acm/TestI.h
+++ b/cpp/test/Ice/acm/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index c171b1b3903..a16bf5fd372 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index eb5dc7a0aa3..92dc35fc2a2 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 73a6e437adb..772c071e3bd 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mk b/cpp/test/Ice/adapterDeactivation/Makefile.mk
index 2ab39553840..91997fe4e5e 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile.mk
+++ b/cpp/test/Ice/adapterDeactivation/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index 3f86c0f72d9..16d54bb5adf 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index eaa14994336..997da11bd36 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SERVANT_LOCATOR_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index affbdd4ca9e..ab3e485cafb 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice
index 45fdf487cf9..e617afd08f7 100644
--- a/cpp/test/Ice/adapterDeactivation/Test.ice
+++ b/cpp/test/Ice/adapterDeactivation/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 879e99839e8..73837ea5f7a 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h
index 44505e9dae0..df40053483d 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.h
+++ b/cpp/test/Ice/adapterDeactivation/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp
index ebba5849f1a..a4c003d93ac 100644
--- a/cpp/test/Ice/admin/AllTests.cpp
+++ b/cpp/test/Ice/admin/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/admin/Client.cpp b/cpp/test/Ice/admin/Client.cpp
index d0854845b3f..360928642fd 100644
--- a/cpp/test/Ice/admin/Client.cpp
+++ b/cpp/test/Ice/admin/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp
index 9e3f1129629..d4c46250e17 100644
--- a/cpp/test/Ice/admin/Server.cpp
+++ b/cpp/test/Ice/admin/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/admin/Test.ice b/cpp/test/Ice/admin/Test.ice
index a685f1db90b..ccdd2129e4d 100644
--- a/cpp/test/Ice/admin/Test.ice
+++ b/cpp/test/Ice/admin/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ICE
diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp
index bc832762557..b08d6a2c0ef 100644
--- a/cpp/test/Ice/admin/TestI.cpp
+++ b/cpp/test/Ice/admin/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/admin/TestI.h b/cpp/test/Ice/admin/TestI.h
index 2d1f9729e2d..3f670667fb6 100644
--- a/cpp/test/Ice/admin/TestI.h
+++ b/cpp/test/Ice/admin/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
index 479ca4767d8..d1e8e260a69 100644
--- a/cpp/test/Ice/ami/AllTests.cpp
+++ b/cpp/test/Ice/ami/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index 99551772fd4..a163a4ff77c 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp
index f234bb5f9b5..7f26d7e466b 100644
--- a/cpp/test/Ice/ami/Collocated.cpp
+++ b/cpp/test/Ice/ami/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp
index df6141a2bf6..2f96e4cea27 100644
--- a/cpp/test/Ice/ami/Server.cpp
+++ b/cpp/test/Ice/ami/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/ami/Test.ice b/cpp/test/Ice/ami/Test.ice
index 0208d03333e..421decca079 100644
--- a/cpp/test/Ice/ami/Test.ice
+++ b/cpp/test/Ice/ami/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp
index fd4d4e4f446..aca0f3e9d9d 100644
--- a/cpp/test/Ice/ami/TestI.cpp
+++ b/cpp/test/Ice/ami/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
index 06d776dee91..c49f2d96dc4 100644
--- a/cpp/test/Ice/ami/TestI.h
+++ b/cpp/test/Ice/ami/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/background/Acceptor.cpp b/cpp/test/Ice/background/Acceptor.cpp
index 8aaaa935da0..d860275400f 100644
--- a/cpp/test/Ice/background/Acceptor.cpp
+++ b/cpp/test/Ice/background/Acceptor.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Acceptor.h b/cpp/test/Ice/background/Acceptor.h
index 70f74870803..a6bf6a9bab7 100644
--- a/cpp/test/Ice/background/Acceptor.h
+++ b/cpp/test/Ice/background/Acceptor.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ACCEPTOR_H
diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp
index c60418f6bd0..203f86f05ff 100644
--- a/cpp/test/Ice/background/AllTests.cpp
+++ b/cpp/test/Ice/background/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp
index ca2d45e8c1f..908939dee44 100644
--- a/cpp/test/Ice/background/Client.cpp
+++ b/cpp/test/Ice/background/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/background/Configuration.cpp b/cpp/test/Ice/background/Configuration.cpp
index 60fc6d2330a..768a81facf4 100644
--- a/cpp/test/Ice/background/Configuration.cpp
+++ b/cpp/test/Ice/background/Configuration.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h
index 57b38b417fe..b45577cf75f 100644
--- a/cpp/test/Ice/background/Configuration.h
+++ b/cpp/test/Ice/background/Configuration.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_CONFIGURATION_H
diff --git a/cpp/test/Ice/background/Connector.cpp b/cpp/test/Ice/background/Connector.cpp
index b9938ceb1da..c8bffb50fa5 100644
--- a/cpp/test/Ice/background/Connector.cpp
+++ b/cpp/test/Ice/background/Connector.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Connector.h b/cpp/test/Ice/background/Connector.h
index 9c5fab8e96e..a1e9c44b1d4 100644
--- a/cpp/test/Ice/background/Connector.h
+++ b/cpp/test/Ice/background/Connector.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_CONNECTOR_H
diff --git a/cpp/test/Ice/background/EndpointFactory.cpp b/cpp/test/Ice/background/EndpointFactory.cpp
index 3220c1acd88..7d2683c924e 100644
--- a/cpp/test/Ice/background/EndpointFactory.cpp
+++ b/cpp/test/Ice/background/EndpointFactory.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/EndpointFactory.h b/cpp/test/Ice/background/EndpointFactory.h
index de7a636c996..1ae6e88b7b6 100644
--- a/cpp/test/Ice/background/EndpointFactory.h
+++ b/cpp/test/Ice/background/EndpointFactory.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ENDPOINT_FACTORY_H
diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp
index e25bdb5d0af..060f5f8fb5c 100644
--- a/cpp/test/Ice/background/EndpointI.cpp
+++ b/cpp/test/Ice/background/EndpointI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h
index 3d0fe733efa..402d2827faf 100644
--- a/cpp/test/Ice/background/EndpointI.h
+++ b/cpp/test/Ice/background/EndpointI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ENDPOINT_I_H
diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk
index 97e26890509..4a122e25118 100644
--- a/cpp/test/Ice/background/Makefile.mk
+++ b/cpp/test/Ice/background/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestTransport
diff --git a/cpp/test/Ice/background/PluginI.cpp b/cpp/test/Ice/background/PluginI.cpp
index 9578819c012..35cc139ec88 100644
--- a/cpp/test/Ice/background/PluginI.cpp
+++ b/cpp/test/Ice/background/PluginI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/PluginI.h b/cpp/test/Ice/background/PluginI.h
index 6e7582a43b6..aa45418bd08 100644
--- a/cpp/test/Ice/background/PluginI.h
+++ b/cpp/test/Ice/background/PluginI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_PLUGIN_H
diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp
index 0b749abf652..6fd2f985ad5 100644
--- a/cpp/test/Ice/background/Server.cpp
+++ b/cpp/test/Ice/background/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/background/Test.ice b/cpp/test/Ice/background/Test.ice
index f4e57dafc06..b71c554f08c 100644
--- a/cpp/test/Ice/background/Test.ice
+++ b/cpp/test/Ice/background/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/background/TestI.cpp b/cpp/test/Ice/background/TestI.cpp
index 8288e8da8b2..2036f565bdb 100644
--- a/cpp/test/Ice/background/TestI.cpp
+++ b/cpp/test/Ice/background/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/background/TestI.h b/cpp/test/Ice/background/TestI.h
index d08b86d8307..48134d14ada 100644
--- a/cpp/test/Ice/background/TestI.h
+++ b/cpp/test/Ice/background/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp
index 131ea294108..1cddedce2f1 100644
--- a/cpp/test/Ice/background/Transceiver.cpp
+++ b/cpp/test/Ice/background/Transceiver.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_API_EXPORTS
diff --git a/cpp/test/Ice/background/Transceiver.h b/cpp/test/Ice/background/Transceiver.h
index c515227747d..93a4597f4fb 100644
--- a/cpp/test/Ice/background/Transceiver.h
+++ b/cpp/test/Ice/background/Transceiver.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_TRANSCEIVER_H
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index dd0fd7a578a..d6fa1e27d0e 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Random.h>
diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp
index d0854845b3f..360928642fd 100644
--- a/cpp/test/Ice/binding/Client.cpp
+++ b/cpp/test/Ice/binding/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp
index c86a8314952..476652d9576 100644
--- a/cpp/test/Ice/binding/Server.cpp
+++ b/cpp/test/Ice/binding/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/binding/Test.ice b/cpp/test/Ice/binding/Test.ice
index 36cd51d53aa..81601a8f60a 100644
--- a/cpp/test/Ice/binding/Test.ice
+++ b/cpp/test/Ice/binding/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp
index c4d44a975a9..89d96b691bd 100644
--- a/cpp/test/Ice/binding/TestI.cpp
+++ b/cpp/test/Ice/binding/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/binding/TestI.h b/cpp/test/Ice/binding/TestI.h
index d82ef956b42..59b47e893af 100644
--- a/cpp/test/Ice/binding/TestI.h
+++ b/cpp/test/Ice/binding/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp
index 413ee88ea55..f1cc344aadc 100644
--- a/cpp/test/Ice/checksum/AllTests.cpp
+++ b/cpp/test/Ice/checksum/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp
index 4f0b5493dcf..17e4958dfb5 100644
--- a/cpp/test/Ice/checksum/Client.cpp
+++ b/cpp/test/Ice/checksum/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/checksum/ClientTypes.ice b/cpp/test/Ice/checksum/ClientTypes.ice
index 84393f2a239..c4f972f0233 100644
--- a/cpp/test/Ice/checksum/ClientTypes.ice
+++ b/cpp/test/Ice/checksum/ClientTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk
index 4b0f8c93298..af0c8c1444b 100644
--- a/cpp/test/Ice/checksum/Makefile.mk
+++ b/cpp/test/Ice/checksum/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_sliceflags = --checksum
diff --git a/cpp/test/Ice/checksum/Server.cpp b/cpp/test/Ice/checksum/Server.cpp
index 0b75e5d97dc..2ff107d5811 100644
--- a/cpp/test/Ice/checksum/Server.cpp
+++ b/cpp/test/Ice/checksum/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/checksum/ServerTypes.ice b/cpp/test/Ice/checksum/ServerTypes.ice
index 38691574ec8..076b7ece96b 100644
--- a/cpp/test/Ice/checksum/ServerTypes.ice
+++ b/cpp/test/Ice/checksum/ServerTypes.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/Test.ice b/cpp/test/Ice/checksum/Test.ice
index 0cf9b300935..aaa305e5e23 100644
--- a/cpp/test/Ice/checksum/Test.ice
+++ b/cpp/test/Ice/checksum/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/checksum/TestI.cpp b/cpp/test/Ice/checksum/TestI.cpp
index 72dc51ee0b6..1bb00ccbe66 100644
--- a/cpp/test/Ice/checksum/TestI.cpp
+++ b/cpp/test/Ice/checksum/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/checksum/TestI.h b/cpp/test/Ice/checksum/TestI.h
index 43ec79dba62..9c4a12aa2bc 100644
--- a/cpp/test/Ice/checksum/TestI.h
+++ b/cpp/test/Ice/checksum/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index bd64800dd08..feb5eb110d5 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp
index a84a077700b..9bc36a3ae53 100644
--- a/cpp/test/Ice/custom/Client.cpp
+++ b/cpp/test/Ice/custom/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp
index 1e8c6fb28af..6ce25027452 100644
--- a/cpp/test/Ice/custom/Collocated.cpp
+++ b/cpp/test/Ice/custom/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/custom/CustomBuffer.h b/cpp/test/Ice/custom/CustomBuffer.h
index 6d462594f5a..dafa058895a 100644
--- a/cpp/test/Ice/custom/CustomBuffer.h
+++ b/cpp/test/Ice/custom/CustomBuffer.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CUSTOM_BUFFER_H
diff --git a/cpp/test/Ice/custom/CustomMap.h b/cpp/test/Ice/custom/CustomMap.h
index ff77b7e2dd9..b099f7b45b5 100644
--- a/cpp/test/Ice/custom/CustomMap.h
+++ b/cpp/test/Ice/custom/CustomMap.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CUSTOM_MAP_H
diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk
index dc4b087a720..bb7a6bed236 100644
--- a/cpp/test/Ice/custom/Makefile.mk
+++ b/cpp/test/Ice/custom/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp \
diff --git a/cpp/test/Ice/custom/MyByteSeq.cpp b/cpp/test/Ice/custom/MyByteSeq.cpp
index 202fe766392..57823082e54 100644
--- a/cpp/test/Ice/custom/MyByteSeq.cpp
+++ b/cpp/test/Ice/custom/MyByteSeq.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <MyByteSeq.h>
diff --git a/cpp/test/Ice/custom/MyByteSeq.h b/cpp/test/Ice/custom/MyByteSeq.h
index 46dffc3077a..fc9afb1dae9 100644
--- a/cpp/test/Ice/custom/MyByteSeq.h
+++ b/cpp/test/Ice/custom/MyByteSeq.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_MY_BYTE_SEQ_H
diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp
index b3260fe5dc7..a3eb27bc7d1 100644
--- a/cpp/test/Ice/custom/Server.cpp
+++ b/cpp/test/Ice/custom/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index 3651ecafc18..01d993b8efe 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp
index 543fcea2337..42e20410fe7 100644
--- a/cpp/test/Ice/custom/StringConverterI.cpp
+++ b/cpp/test/Ice/custom/StringConverterI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <StringConverterI.h>
diff --git a/cpp/test/Ice/custom/StringConverterI.h b/cpp/test/Ice/custom/StringConverterI.h
index 34a922521bd..20b7f612421 100644
--- a/cpp/test/Ice/custom/StringConverterI.h
+++ b/cpp/test/Ice/custom/StringConverterI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef STRING_CONVERTER_I_H
diff --git a/cpp/test/Ice/custom/StringView.h b/cpp/test/Ice/custom/StringView.h
index e628fb4541c..ef1d28230f6 100644
--- a/cpp/test/Ice/custom/StringView.h
+++ b/cpp/test/Ice/custom/StringView.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef STRING_VIEW_H
diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice
index 779636e2aaf..df0d8f58496 100644
--- a/cpp/test/Ice/custom/Test.ice
+++ b/cpp/test/Ice/custom/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice
index 866222b3967..d6ed4372b38 100644
--- a/cpp/test/Ice/custom/TestAMD.ice
+++ b/cpp/test/Ice/custom/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp
index 989b734581b..6e225831a4f 100644
--- a/cpp/test/Ice/custom/TestAMDI.cpp
+++ b/cpp/test/Ice/custom/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h
index 65cfb9f9ac2..7b3ae3dd083 100644
--- a/cpp/test/Ice/custom/TestAMDI.h
+++ b/cpp/test/Ice/custom/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp
index 7ab127680ed..69bea0b4779 100644
--- a/cpp/test/Ice/custom/TestI.cpp
+++ b/cpp/test/Ice/custom/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Communicator.h>
diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h
index 7a78d0e5e7a..62e603b4e11 100644
--- a/cpp/test/Ice/custom/TestI.h
+++ b/cpp/test/Ice/custom/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/custom/Wstring.ice b/cpp/test/Ice/custom/Wstring.ice
index 9c3c82b4ccf..37adafbc923 100644
--- a/cpp/test/Ice/custom/Wstring.ice
+++ b/cpp/test/Ice/custom/Wstring.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/WstringAMD.ice b/cpp/test/Ice/custom/WstringAMD.ice
index dc7d29f21bb..a233f6f82c4 100644
--- a/cpp/test/Ice/custom/WstringAMD.ice
+++ b/cpp/test/Ice/custom/WstringAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp
index 614e1c6bb60..118ac725a8f 100644
--- a/cpp/test/Ice/custom/WstringAMDI.cpp
+++ b/cpp/test/Ice/custom/WstringAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <WstringAMDI.h>
diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h
index 4a7f6b5f4c9..7b92eb5472f 100644
--- a/cpp/test/Ice/custom/WstringAMDI.h
+++ b/cpp/test/Ice/custom/WstringAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef WSTRINGAMD_I_H
diff --git a/cpp/test/Ice/custom/WstringI.cpp b/cpp/test/Ice/custom/WstringI.cpp
index 8f95b3d4467..a847d0dbefe 100644
--- a/cpp/test/Ice/custom/WstringI.cpp
+++ b/cpp/test/Ice/custom/WstringI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <WstringI.h>
diff --git a/cpp/test/Ice/custom/WstringI.h b/cpp/test/Ice/custom/WstringI.h
index e15d1d21bf6..01319294a1e 100644
--- a/cpp/test/Ice/custom/WstringI.h
+++ b/cpp/test/Ice/custom/WstringI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef WSTRING_I_H
diff --git a/cpp/test/Ice/defaultServant/AllTests.cpp b/cpp/test/Ice/defaultServant/AllTests.cpp
index 07fe8ec2771..6a0133ecfb0 100644
--- a/cpp/test/Ice/defaultServant/AllTests.cpp
+++ b/cpp/test/Ice/defaultServant/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/defaultServant/Client.cpp b/cpp/test/Ice/defaultServant/Client.cpp
index 225ff2be72d..1a24f916bf1 100644
--- a/cpp/test/Ice/defaultServant/Client.cpp
+++ b/cpp/test/Ice/defaultServant/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/defaultServant/Makefile.mk b/cpp/test/Ice/defaultServant/Makefile.mk
index 69fa91b2e85..8be04e0e7ff 100644
--- a/cpp/test/Ice/defaultServant/Makefile.mk
+++ b/cpp/test/Ice/defaultServant/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp
diff --git a/cpp/test/Ice/defaultServant/Test.ice b/cpp/test/Ice/defaultServant/Test.ice
index 272d61a9d2c..885d3dd5399 100644
--- a/cpp/test/Ice/defaultServant/Test.ice
+++ b/cpp/test/Ice/defaultServant/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/defaultServant/TestI.cpp b/cpp/test/Ice/defaultServant/TestI.cpp
index 15f10b79c1d..86def233827 100644
--- a/cpp/test/Ice/defaultServant/TestI.cpp
+++ b/cpp/test/Ice/defaultServant/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/defaultServant/TestI.h b/cpp/test/Ice/defaultServant/TestI.h
index 6c55884ea91..0c842cba754 100644
--- a/cpp/test/Ice/defaultServant/TestI.h
+++ b/cpp/test/Ice/defaultServant/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/defaultValue/AllTests.cpp b/cpp/test/Ice/defaultValue/AllTests.cpp
index 392ab0d8506..72f2e00cb99 100644
--- a/cpp/test/Ice/defaultValue/AllTests.cpp
+++ b/cpp/test/Ice/defaultValue/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/defaultValue/Client.cpp b/cpp/test/Ice/defaultValue/Client.cpp
index d89fc6a963a..c8cc2b4b9c3 100644
--- a/cpp/test/Ice/defaultValue/Client.cpp
+++ b/cpp/test/Ice/defaultValue/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/defaultValue/Test.ice b/cpp/test/Ice/defaultValue/Test.ice
index 1ac31fd008a..3f1ea2a919c 100644
--- a/cpp/test/Ice/defaultValue/Test.ice
+++ b/cpp/test/Ice/defaultValue/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp
index 313dc062d74..48219e295a9 100644
--- a/cpp/test/Ice/dispatcher/AllTests.cpp
+++ b/cpp/test/Ice/dispatcher/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index 4a9477a41c5..fa1377a9add 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp
index 1abc08eb52e..5488daf173d 100644
--- a/cpp/test/Ice/dispatcher/Collocated.cpp
+++ b/cpp/test/Ice/dispatcher/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp
index 25991c297e3..54f77652ba0 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.cpp
+++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Dispatcher.h>
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h
index a1a145bce66..d581b133572 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.h
+++ b/cpp/test/Ice/dispatcher/Dispatcher.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef DISPATCHER_I_H
diff --git a/cpp/test/Ice/dispatcher/Makefile.mk b/cpp/test/Ice/dispatcher/Makefile.mk
index 6f14c6dce8c..7faa84cfac5 100644
--- a/cpp/test/Ice/dispatcher/Makefile.mk
+++ b/cpp/test/Ice/dispatcher/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = $(test-client-sources) Dispatcher.cpp
diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp
index 0c3bad763c1..26a140b2245 100644
--- a/cpp/test/Ice/dispatcher/Server.cpp
+++ b/cpp/test/Ice/dispatcher/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/dispatcher/Test.ice b/cpp/test/Ice/dispatcher/Test.ice
index 1e8d9bfa6a0..0ece0f0cded 100644
--- a/cpp/test/Ice/dispatcher/Test.ice
+++ b/cpp/test/Ice/dispatcher/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp
index aced553f8e2..eb74f5941bf 100644
--- a/cpp/test/Ice/dispatcher/TestI.cpp
+++ b/cpp/test/Ice/dispatcher/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h
index e0a6fb698d6..5fc9ac8b106 100644
--- a/cpp/test/Ice/dispatcher/TestI.h
+++ b/cpp/test/Ice/dispatcher/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/echo/BlobjectI.cpp b/cpp/test/Ice/echo/BlobjectI.cpp
index bd7f4186dc8..67099732320 100644
--- a/cpp/test/Ice/echo/BlobjectI.cpp
+++ b/cpp/test/Ice/echo/BlobjectI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/echo/BlobjectI.h b/cpp/test/Ice/echo/BlobjectI.h
index b750a24e318..9148df698d6 100644
--- a/cpp/test/Ice/echo/BlobjectI.h
+++ b/cpp/test/Ice/echo/BlobjectI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BLOBJECT_H
diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk
index b3b9a47f5d0..1923663a2c4 100644
--- a/cpp/test/Ice/echo/Makefile.mk
+++ b/cpp/test/Ice/echo/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp
diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp
index 35cc32908d9..af3523abbb4 100644
--- a/cpp/test/Ice/echo/Server.cpp
+++ b/cpp/test/Ice/echo/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/echo/Test.ice b/cpp/test/Ice/echo/Test.ice
index 5678f913272..f9684eb6186 100644
--- a/cpp/test/Ice/echo/Test.ice
+++ b/cpp/test/Ice/echo/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/echo/test.py b/cpp/test/Ice/echo/test.py
index efb58cfbc8a..6372520856c 100644
--- a/cpp/test/Ice/echo/test.py
+++ b/cpp/test/Ice/echo/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class EchoServerTestCase(ClientServerTestCase):
diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp
index b719ead263c..c3e0d1a86e8 100644
--- a/cpp/test/Ice/enums/AllTests.cpp
+++ b/cpp/test/Ice/enums/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp
index a3375ecf2a5..625d866578c 100644
--- a/cpp/test/Ice/enums/Client.cpp
+++ b/cpp/test/Ice/enums/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp
index c0b1d4f66f2..e4eb53ca0be 100644
--- a/cpp/test/Ice/enums/Server.cpp
+++ b/cpp/test/Ice/enums/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/enums/Test.ice b/cpp/test/Ice/enums/Test.ice
index ff1bd9c51c3..d65c86e4d53 100644
--- a/cpp/test/Ice/enums/Test.ice
+++ b/cpp/test/Ice/enums/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/enums/TestI.cpp b/cpp/test/Ice/enums/TestI.cpp
index 089079b648d..73e3dc86479 100644
--- a/cpp/test/Ice/enums/TestI.cpp
+++ b/cpp/test/Ice/enums/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/enums/TestI.h b/cpp/test/Ice/enums/TestI.h
index 9f530dea9f1..11acbd75127 100644
--- a/cpp/test/Ice/enums/TestI.h
+++ b/cpp/test/Ice/enums/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index a3452439ac3..d2418765683 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index c6ffacca374..86128abcd1b 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 9729c915eb4..de20c505011 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/ExceptionsI.cpp b/cpp/test/Ice/exceptions/ExceptionsI.cpp
index b34052e7393..bc0ee55ad21 100644
--- a/cpp/test/Ice/exceptions/ExceptionsI.cpp
+++ b/cpp/test/Ice/exceptions/ExceptionsI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef ICE_AMD_TEST
diff --git a/cpp/test/Ice/exceptions/Makefile.mk b/cpp/test/Ice/exceptions/Makefile.mk
index ff186552249..9492690c29b 100644
--- a/cpp/test/Ice/exceptions/Makefile.mk
+++ b/cpp/test/Ice/exceptions/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = $(test-client-sources) ExceptionsI.cpp
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 12af60bfb43..5979bf4164a 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 54953780637..6f35d073364 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index 2e309b89fe8..29646921a5f 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice
index 4214fe6528a..c2f70754ab1 100644
--- a/cpp/test/Ice/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/exceptions/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp
index 4970d6d04fa..af5b8dcb4e5 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/exceptions/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h
index aed75f37ee3..e2f04e691bc 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/exceptions/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index fe939fd3d8d..e83b7a58cce 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h
index fa4ad7bb298..599e879a4d1 100644
--- a/cpp/test/Ice/exceptions/TestI.h
+++ b/cpp/test/Ice/exceptions/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 01f12f9089e..d60d3c573ce 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index dd3673d6816..e5553e1dcfc 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index b7dbc005214..03ec2755064 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index b54ed19eb41..eddff3b0c80 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice
index d5bd230d689..9c2049dde9e 100644
--- a/cpp/test/Ice/facets/Test.ice
+++ b/cpp/test/Ice/facets/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp
index e0640bafbe8..6d406d02306 100644
--- a/cpp/test/Ice/facets/TestI.cpp
+++ b/cpp/test/Ice/facets/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index 62b4aa25ccb..a7f61c92661 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index cf2fa556194..6ba197b066a 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp
index 9fbf76b6125..61197ee2012 100644
--- a/cpp/test/Ice/faultTolerance/Client.cpp
+++ b/cpp/test/Ice/faultTolerance/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index 77c0ac5b17a..ee3cf850c9b 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index 0dbe0943461..7d155bcd297 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index ae226755ca7..0ea21dfbe74 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index d215d959d80..b12b5ee5c69 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index 89cf8076bae..bb71d561661 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice
index 529300a7fc9..07ec46cf0a9 100644
--- a/cpp/test/Ice/gc/Test.ice
+++ b/cpp/test/Ice/gc/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/gc/test.py b/cpp/test/Ice/gc/test.py
index 8ce24faa058..3ce21186bc9 100644
--- a/cpp/test/Ice/gc/test.py
+++ b/cpp/test/Ice/gc/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__name__, options = { "cpp11" : [False] })
diff --git a/cpp/test/Ice/hash/Client.cpp b/cpp/test/Ice/hash/Client.cpp
index 8696113aa6c..3e08534dc0a 100644
--- a/cpp/test/Ice/hash/Client.cpp
+++ b/cpp/test/Ice/hash/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/hash/Test.ice b/cpp/test/Ice/hash/Test.ice
index 58910c636e4..5849f27272c 100644
--- a/cpp/test/Ice/hash/Test.ice
+++ b/cpp/test/Ice/hash/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp
index beb51c7877d..d8616a20e7b 100644
--- a/cpp/test/Ice/hold/AllTests.cpp
+++ b/cpp/test/Ice/hold/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp
index 225ff2be72d..1a24f916bf1 100644
--- a/cpp/test/Ice/hold/Client.cpp
+++ b/cpp/test/Ice/hold/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp
index 0266c3eea2c..af66c0687a0 100644
--- a/cpp/test/Ice/hold/Server.cpp
+++ b/cpp/test/Ice/hold/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/hold/Test.ice b/cpp/test/Ice/hold/Test.ice
index 0f3b2e7f856..66ac16fdcbe 100644
--- a/cpp/test/Ice/hold/Test.ice
+++ b/cpp/test/Ice/hold/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/hold/TestI.cpp b/cpp/test/Ice/hold/TestI.cpp
index 094483545cc..54a635c3ca7 100644
--- a/cpp/test/Ice/hold/TestI.cpp
+++ b/cpp/test/Ice/hold/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/hold/TestI.h b/cpp/test/Ice/hold/TestI.h
index ff4a7426d70..37e1d554f28 100644
--- a/cpp/test/Ice/hold/TestI.h
+++ b/cpp/test/Ice/hold/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk
index 2e8690312fc..6fb01213eb9 100644
--- a/cpp/test/Ice/impl/Makefile.mk
+++ b/cpp/test/Ice/impl/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_server_impl = Test
diff --git a/cpp/test/Ice/impl/Server.cpp b/cpp/test/Ice/impl/Server.cpp
index a908cb02814..d6ac0be17ed 100644
--- a/cpp/test/Ice/impl/Server.cpp
+++ b/cpp/test/Ice/impl/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/impl/ServerAMD.cpp b/cpp/test/Ice/impl/ServerAMD.cpp
index 829df7a5203..06f235c16c6 100644
--- a/cpp/test/Ice/impl/ServerAMD.cpp
+++ b/cpp/test/Ice/impl/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/impl/Test.ice b/cpp/test/Ice/impl/Test.ice
index a48b5965f3d..58a867270d9 100644
--- a/cpp/test/Ice/impl/Test.ice
+++ b/cpp/test/Ice/impl/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/impl/TestAMD.ice b/cpp/test/Ice/impl/TestAMD.ice
index 8c9241e7649..61f7740962b 100644
--- a/cpp/test/Ice/impl/TestAMD.ice
+++ b/cpp/test/Ice/impl/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp
index e6f6e9960ea..d33be6bfe86 100644
--- a/cpp/test/Ice/info/AllTests.cpp
+++ b/cpp/test/Ice/info/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp
index d0854845b3f..360928642fd 100644
--- a/cpp/test/Ice/info/Client.cpp
+++ b/cpp/test/Ice/info/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk
index 53270eeaf88..729158fd235 100644
--- a/cpp/test/Ice/info/Makefile.mk
+++ b/cpp/test/Ice/info/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp
diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp
index a5c97e52ffd..5c14f9e9e9d 100644
--- a/cpp/test/Ice/info/Server.cpp
+++ b/cpp/test/Ice/info/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/info/Test.ice b/cpp/test/Ice/info/Test.ice
index b428fd6a065..000e1ac62d0 100644
--- a/cpp/test/Ice/info/Test.ice
+++ b/cpp/test/Ice/info/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/info/TestI.cpp b/cpp/test/Ice/info/TestI.cpp
index 23665e9522e..9f5dcd8cadd 100644
--- a/cpp/test/Ice/info/TestI.cpp
+++ b/cpp/test/Ice/info/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/info/TestI.h b/cpp/test/Ice/info/TestI.h
index 1469fc11758..31644b2ed1e 100644
--- a/cpp/test/Ice/info/TestI.h
+++ b/cpp/test/Ice/info/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 18045b072cf..a57ea041410 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index 2440a086071..cc6cbf292b9 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 13d45cc82b0..88b39c0c5dc 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index de4e90fe0e3..9c52cf02403 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice
index 1741e607db0..6c22cca9133 100644
--- a/cpp/test/Ice/inheritance/Test.ice
+++ b/cpp/test/Ice/inheritance/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index d6bed7d590e..940fc58734d 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index e952e41d271..3c9a7b76ccd 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTI_H
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index 83359d018a8..3fa676eca35 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h
index 9b82eea8d9f..4a0c382f9fa 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.h
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef AMD_INTERCEPTOR_I_H
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index 3d22b438d18..e6d778bf1de 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/interceptor/InterceptorI.cpp b/cpp/test/Ice/interceptor/InterceptorI.cpp
index 48c0474ee34..7d6c921e8e2 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/InterceptorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <InterceptorI.h>
diff --git a/cpp/test/Ice/interceptor/InterceptorI.h b/cpp/test/Ice/interceptor/InterceptorI.h
index d57a13ca21b..a91753e352c 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.h
+++ b/cpp/test/Ice/interceptor/InterceptorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INTERCEPTOR_I_H
diff --git a/cpp/test/Ice/interceptor/Makefile.mk b/cpp/test/Ice/interceptor/Makefile.mk
index 586d70bb029..a87ea2f9e3f 100644
--- a/cpp/test/Ice/interceptor/Makefile.mk
+++ b/cpp/test/Ice/interceptor/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp Test.ice TestI.cpp MyObjectI.cpp InterceptorI.cpp AMDInterceptorI.cpp
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index d77df97835f..531856020de 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h
index babdd74457c..7de63b4b285 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.h
+++ b/cpp/test/Ice/interceptor/MyObjectI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef MY_OBJECT_I_H
diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice
index 27733e24747..e2d10f86b66 100644
--- a/cpp/test/Ice/interceptor/Test.ice
+++ b/cpp/test/Ice/interceptor/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/interceptor/TestI.cpp b/cpp/test/Ice/interceptor/TestI.cpp
index 3c5b716404d..d363599e492 100644
--- a/cpp/test/Ice/interceptor/TestI.cpp
+++ b/cpp/test/Ice/interceptor/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INTERCEPTOR_TEST_API_EXPORTS
diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp
index 2a915038435..7f758d862f1 100644
--- a/cpp/test/Ice/invoke/AllTests.cpp
+++ b/cpp/test/Ice/invoke/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index 801cb959d29..f1785e75fec 100644
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/invoke/BlobjectI.h b/cpp/test/Ice/invoke/BlobjectI.h
index 2a50c5d7ef5..a10b9f91fab 100644
--- a/cpp/test/Ice/invoke/BlobjectI.h
+++ b/cpp/test/Ice/invoke/BlobjectI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef BLOBJECT_H
diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp
index c7e4b3bf359..490a992b417 100644
--- a/cpp/test/Ice/invoke/Client.cpp
+++ b/cpp/test/Ice/invoke/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/invoke/Makefile.mk b/cpp/test/Ice/invoke/Makefile.mk
index fa94602ea80..dace4acad22 100644
--- a/cpp/test/Ice/invoke/Makefile.mk
+++ b/cpp/test/Ice/invoke/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp
diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp
index 2a3e23875f5..0abb10dbb65 100644
--- a/cpp/test/Ice/invoke/Server.cpp
+++ b/cpp/test/Ice/invoke/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/invoke/Test.ice b/cpp/test/Ice/invoke/Test.ice
index 1646a80f7e2..3fb8d3df4a9 100644
--- a/cpp/test/Ice/invoke/Test.ice
+++ b/cpp/test/Ice/invoke/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/library/AllTests.cpp b/cpp/test/Ice/library/AllTests.cpp
index 20319e64419..7731ccd960f 100644
--- a/cpp/test/Ice/library/AllTests.cpp
+++ b/cpp/test/Ice/library/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/library/Client.cpp b/cpp/test/Ice/library/Client.cpp
index 5783d35f2c5..720dccdf328 100644
--- a/cpp/test/Ice/library/Client.cpp
+++ b/cpp/test/Ice/library/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/library/Consumer.cpp b/cpp/test/Ice/library/Consumer.cpp
index adafd8d3f21..8ebbab4d4ea 100644
--- a/cpp/test/Ice/library/Consumer.cpp
+++ b/cpp/test/Ice/library/Consumer.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Test.h>
diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk
index 3d1f042786a..38f54ee5083 100644
--- a/cpp/test/Ice/library/Makefile.mk
+++ b/cpp/test/Ice/library/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests
diff --git a/cpp/test/Ice/library/Test.ice b/cpp/test/Ice/library/Test.ice
index c0b395a7962..87c0683fc6f 100644
--- a/cpp/test/Ice/library/Test.ice
+++ b/cpp/test/Ice/library/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/library/test.py b/cpp/test/Ice/library/test.py
index 22f8b521663..d85bcd502c8 100644
--- a/cpp/test/Ice/library/test.py
+++ b/cpp/test/Ice/library/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__file__, libDirs=["gencode", "consumer", "alltests"])
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 1b4709e939d..fc2ef64a454 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index fe3d61d5ad7..1d5f1390f25 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/location/Makefile.mk b/cpp/test/Ice/location/Makefile.mk
index 64ede1395fb..f132663ff11 100644
--- a/cpp/test/Ice/location/Makefile.mk
+++ b/cpp/test/Ice/location/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_server_sources = $(test-server-sources) ServerLocator.cpp
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index db46724bb68..b5bfae7152d 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index 123b526ec57..40797c7e35a 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index 42f158b5064..dcd798d33d2 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SERVER_LOCATOR_H
diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice
index 05b6e1146f6..4480ddb4d34 100644
--- a/cpp/test/Ice/location/Test.ice
+++ b/cpp/test/Ice/location/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index efb4b205982..26c626650eb 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h
index 65747b0682f..1e659891ef7 100644
--- a/cpp/test/Ice/location/TestI.h
+++ b/cpp/test/Ice/location/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/logger/Client1.cpp b/cpp/test/Ice/logger/Client1.cpp
index 878712ffb38..bd18cd2150a 100644
--- a/cpp/test/Ice/logger/Client1.cpp
+++ b/cpp/test/Ice/logger/Client1.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp
index a695abe5b64..492a853a03d 100644
--- a/cpp/test/Ice/logger/Client2.cpp
+++ b/cpp/test/Ice/logger/Client2.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/logger/Client3.cpp b/cpp/test/Ice/logger/Client3.cpp
index 5762fb3ed4b..0923ace8833 100644
--- a/cpp/test/Ice/logger/Client3.cpp
+++ b/cpp/test/Ice/logger/Client3.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/logger/Client4.cpp b/cpp/test/Ice/logger/Client4.cpp
index 68de931d4db..863e10112e6 100644
--- a/cpp/test/Ice/logger/Client4.cpp
+++ b/cpp/test/Ice/logger/Client4.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/logger/Client5.cpp b/cpp/test/Ice/logger/Client5.cpp
index 5c8615ed4e4..0ddcb3200a1 100644
--- a/cpp/test/Ice/logger/Client5.cpp
+++ b/cpp/test/Ice/logger/Client5.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk
index 6759b5f6eb4..4e56a9068ec 100644
--- a/cpp/test/Ice/logger/Makefile.mk
+++ b/cpp/test/Ice/logger/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = client1 client2 client3 client4 client5
diff --git a/cpp/test/Ice/logger/test.py b/cpp/test/Ice/logger/test.py
index 740a544c9cb..34eed746f01 100644
--- a/cpp/test/Ice/logger/test.py
+++ b/cpp/test/Ice/logger/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import glob
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 4c8292f5435..d4e8c9a8bb1 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp
index 02dc2ad3917..faede5a3147 100644
--- a/cpp/test/Ice/metrics/Client.cpp
+++ b/cpp/test/Ice/metrics/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp
index 34fc53f1d3d..f8acb90b78d 100644
--- a/cpp/test/Ice/metrics/Collocated.cpp
+++ b/cpp/test/Ice/metrics/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/InstrumentationI.h b/cpp/test/Ice/metrics/InstrumentationI.h
index 39c39326ec0..263357327ba 100644
--- a/cpp/test/Ice/metrics/InstrumentationI.h
+++ b/cpp/test/Ice/metrics/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp
index 0ca3b69fd6a..24c61391537 100644
--- a/cpp/test/Ice/metrics/Server.cpp
+++ b/cpp/test/Ice/metrics/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp
index 8800e94fcbb..88298a44a91 100644
--- a/cpp/test/Ice/metrics/ServerAMD.cpp
+++ b/cpp/test/Ice/metrics/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/Test.ice b/cpp/test/Ice/metrics/Test.ice
index f53498320a6..49538e5f5b0 100644
--- a/cpp/test/Ice/metrics/Test.ice
+++ b/cpp/test/Ice/metrics/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/metrics/TestAMD.ice b/cpp/test/Ice/metrics/TestAMD.ice
index 008f9c0e38c..f042f81108a 100644
--- a/cpp/test/Ice/metrics/TestAMD.ice
+++ b/cpp/test/Ice/metrics/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/metrics/TestAMDI.cpp b/cpp/test/Ice/metrics/TestAMDI.cpp
index 21def3d1418..45d7038f593 100644
--- a/cpp/test/Ice/metrics/TestAMDI.cpp
+++ b/cpp/test/Ice/metrics/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/TestAMDI.h b/cpp/test/Ice/metrics/TestAMDI.h
index a713469a1e3..362b4c02312 100644
--- a/cpp/test/Ice/metrics/TestAMDI.h
+++ b/cpp/test/Ice/metrics/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/metrics/TestI.cpp b/cpp/test/Ice/metrics/TestI.cpp
index 4f08ce5f94f..19f8946569b 100644
--- a/cpp/test/Ice/metrics/TestI.cpp
+++ b/cpp/test/Ice/metrics/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/metrics/TestI.h b/cpp/test/Ice/metrics/TestI.h
index 6161d682328..cf1ade529a5 100644
--- a/cpp/test/Ice/metrics/TestI.h
+++ b/cpp/test/Ice/metrics/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/networkProxy/AllTests.cpp b/cpp/test/Ice/networkProxy/AllTests.cpp
index 4018759377a..ee6c5d1f4b5 100644
--- a/cpp/test/Ice/networkProxy/AllTests.cpp
+++ b/cpp/test/Ice/networkProxy/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/networkProxy/Client.cpp b/cpp/test/Ice/networkProxy/Client.cpp
index 225ff2be72d..1a24f916bf1 100644
--- a/cpp/test/Ice/networkProxy/Client.cpp
+++ b/cpp/test/Ice/networkProxy/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/networkProxy/Server.cpp b/cpp/test/Ice/networkProxy/Server.cpp
index 66ae94ff8de..b0f5aefd182 100644
--- a/cpp/test/Ice/networkProxy/Server.cpp
+++ b/cpp/test/Ice/networkProxy/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/networkProxy/Test.ice b/cpp/test/Ice/networkProxy/Test.ice
index 2055861712a..3bbeb49af45 100644
--- a/cpp/test/Ice/networkProxy/Test.ice
+++ b/cpp/test/Ice/networkProxy/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 8a8f5b4b990..b104624112c 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 2488edddfe4..436197dca9c 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index affba9dfa7b..ed28cbbd32f 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/objects/Derived.ice b/cpp/test/Ice/objects/Derived.ice
index 2ce14daa078..d72edb6d4cb 100644
--- a/cpp/test/Ice/objects/Derived.ice
+++ b/cpp/test/Ice/objects/Derived.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/DerivedEx.ice b/cpp/test/Ice/objects/DerivedEx.ice
index c82226e8499..d37c1af7499 100644
--- a/cpp/test/Ice/objects/DerivedEx.ice
+++ b/cpp/test/Ice/objects/DerivedEx.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk
index ac95b64d25c..6ebf64041a5 100644
--- a/cpp/test/Ice/objects/Makefile.mk
+++ b/cpp/test/Ice/objects/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_sliceflags := -I$(test)
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 8a501805984..d57bdabb05c 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index 18e9a88a7e0..fbd054a8a2a 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index f016a679e73..7627de738a4 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 49ea1dd2e13..ee89a5bda6a 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/objects/TestIntfI.cpp b/cpp/test/Ice/objects/TestIntfI.cpp
index 17e71571c24..eeb8afe2cfe 100644
--- a/cpp/test/Ice/objects/TestIntfI.cpp
+++ b/cpp/test/Ice/objects/TestIntfI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index fcef39b40b6..6038d90b725 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index 4e370a75710..9fd411ce29f 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
index a70aee233e0..02b169ab493 100644
--- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 654b7144de6..e4831aed0b4 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 71873aaea12..c1d9bea4e07 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk
index 989f2076168..d7fd0b11d25 100644
--- a/cpp/test/Ice/operations/Makefile.mk
+++ b/cpp/test/Ice/operations/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Test.ice \
diff --git a/cpp/test/Ice/operations/Oneways.cpp b/cpp/test/Ice/operations/Oneways.cpp
index fa05a605505..f0e18b55d0e 100644
--- a/cpp/test/Ice/operations/Oneways.cpp
+++ b/cpp/test/Ice/operations/Oneways.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp
index e6a9c19280a..8ccc19d189a 100644
--- a/cpp/test/Ice/operations/OnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/OnewaysAMI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index aa562f539a1..d3dd5d36e26 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 226a89792ed..2080c69e2cb 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index a91f1cd179b..d63a62068bf 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice
index 55563fb6b84..878e3e0c9dc 100644
--- a/cpp/test/Ice/operations/TestAMD.ice
+++ b/cpp/test/Ice/operations/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index d9841e08223..247d845f7b9 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 538d84afc5b..214287a872a 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_AMD_I_H
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index ae7bf409273..60824262665 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 2c7defd59d4..9825970aea2 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index e8e553d382c..1a7cf10d191 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index ed0f7593f20..2596a5eb2e1 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp
index b59a77e934f..e20a672c7a5 100644
--- a/cpp/test/Ice/optional/AllTests.cpp
+++ b/cpp/test/Ice/optional/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef _MSC_VER
diff --git a/cpp/test/Ice/optional/Client.cpp b/cpp/test/Ice/optional/Client.cpp
index 3c98f6361e2..d917e797b41 100644
--- a/cpp/test/Ice/optional/Client.cpp
+++ b/cpp/test/Ice/optional/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/CustomMap.h b/cpp/test/Ice/optional/CustomMap.h
index 61c3bb89062..4ac4b16ab97 100644
--- a/cpp/test/Ice/optional/CustomMap.h
+++ b/cpp/test/Ice/optional/CustomMap.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CUSTOM_MAP_H
diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp
index 691f6e1ab9c..81d0eaf5a86 100644
--- a/cpp/test/Ice/optional/Server.cpp
+++ b/cpp/test/Ice/optional/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/ServerAMD.cpp b/cpp/test/Ice/optional/ServerAMD.cpp
index 6bc2d19115a..602937c18c6 100644
--- a/cpp/test/Ice/optional/ServerAMD.cpp
+++ b/cpp/test/Ice/optional/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/StringView.h b/cpp/test/Ice/optional/StringView.h
index f146507e64c..0317f2158b3 100644
--- a/cpp/test/Ice/optional/StringView.h
+++ b/cpp/test/Ice/optional/StringView.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef STRING_VIEW_H
diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice
index 45ab8fdc65e..249b15d03a1 100644
--- a/cpp/test/Ice/optional/Test.ice
+++ b/cpp/test/Ice/optional/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice
index 0ca93bd8a80..ca499ed91a7 100644
--- a/cpp/test/Ice/optional/TestAMD.ice
+++ b/cpp/test/Ice/optional/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp
index a036054013e..973a0eea0a8 100644
--- a/cpp/test/Ice/optional/TestAMDI.cpp
+++ b/cpp/test/Ice/optional/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h
index bfce6b42591..6ff02150a72 100644
--- a/cpp/test/Ice/optional/TestAMDI.h
+++ b/cpp/test/Ice/optional/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
index ca5512c9450..56bbde3a857 100644
--- a/cpp/test/Ice/optional/TestI.cpp
+++ b/cpp/test/Ice/optional/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h
index 6ebfd7ab1a4..670fb62a547 100644
--- a/cpp/test/Ice/optional/TestI.h
+++ b/cpp/test/Ice/optional/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp
index 936ca621e2c..695ebc27bd4 100644
--- a/cpp/test/Ice/plugin/Client.cpp
+++ b/cpp/test/Ice/plugin/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/plugin/Makefile.mk b/cpp/test/Ice/plugin/Makefile.mk
index 7c2b41c7379..38abaaa9705 100644
--- a/cpp/test/Ice/plugin/Makefile.mk
+++ b/cpp/test/Ice/plugin/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestPlugin
diff --git a/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp
index a50e9fe160f..44bf8042271 100644
--- a/cpp/test/Ice/plugin/Plugin.cpp
+++ b/cpp/test/Ice/plugin/Plugin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/plugin/test.py b/cpp/test/Ice/plugin/test.py
index b1be9b4e68f..195c9ac54d8 100644
--- a/cpp/test/Ice/plugin/test.py
+++ b/cpp/test/Ice/plugin/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__file__,
diff --git a/cpp/test/Ice/properties/Client.cpp b/cpp/test/Ice/properties/Client.cpp
index 12133a3237c..07b726e7fae 100644
--- a/cpp/test/Ice/properties/Client.cpp
+++ b/cpp/test/Ice/properties/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index f41a066ada9..a19f5efa7fc 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index c5ba8c53c7a..37e0e5c1898 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index 0ac60f92832..456561cb3d1 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp
index af41ea4f388..2badef6e45b 100644
--- a/cpp/test/Ice/proxy/Server.cpp
+++ b/cpp/test/Ice/proxy/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index ed0f3ca658c..2a95d77ce46 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/Test.ice b/cpp/test/Ice/proxy/Test.ice
index 97d34b81219..d659df358b9 100644
--- a/cpp/test/Ice/proxy/Test.ice
+++ b/cpp/test/Ice/proxy/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/proxy/TestAMD.ice b/cpp/test/Ice/proxy/TestAMD.ice
index 472d2071307..1bff898e32d 100644
--- a/cpp/test/Ice/proxy/TestAMD.ice
+++ b/cpp/test/Ice/proxy/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index 69170655945..5bf630903ff 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index 905413aa1e6..2d26786c7d0 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_AMD_I_H
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index 282ce22a17e..b5f54ca71cc 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h
index 673ef2cdf20..32349b4e6d7 100644
--- a/cpp/test/Ice/proxy/TestI.h
+++ b/cpp/test/Ice/proxy/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp
index 76852eedfe8..37caf39dafa 100644
--- a/cpp/test/Ice/retry/AllTests.cpp
+++ b/cpp/test/Ice/retry/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index b049db50941..1e67678b422 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp
index 4a46296d5c2..063f07f8b07 100644
--- a/cpp/test/Ice/retry/Collocated.cpp
+++ b/cpp/test/Ice/retry/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/InstrumentationI.cpp b/cpp/test/Ice/retry/InstrumentationI.cpp
index e1446ec86df..2fc1fcccb07 100644
--- a/cpp/test/Ice/retry/InstrumentationI.cpp
+++ b/cpp/test/Ice/retry/InstrumentationI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/InstrumentationI.h b/cpp/test/Ice/retry/InstrumentationI.h
index e3356951edb..e447fb2491f 100644
--- a/cpp/test/Ice/retry/InstrumentationI.h
+++ b/cpp/test/Ice/retry/InstrumentationI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef INSTRUMENTATION_I_H
diff --git a/cpp/test/Ice/retry/Makefile.mk b/cpp/test/Ice/retry/Makefile.mk
index 967201433eb..b5b41efa027 100644
--- a/cpp/test/Ice/retry/Makefile.mk
+++ b/cpp/test/Ice/retry/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp
diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index 6fa4662ed2c..abcc0243b72 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/SystemFailure.h b/cpp/test/Ice/retry/SystemFailure.h
index 51a79b3e755..c6916aabfb3 100644
--- a/cpp/test/Ice/retry/SystemFailure.h
+++ b/cpp/test/Ice/retry/SystemFailure.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SYSTEMFAILURE_H
diff --git a/cpp/test/Ice/retry/Test.ice b/cpp/test/Ice/retry/Test.ice
index a3285947f41..c55eabdba5c 100644
--- a/cpp/test/Ice/retry/Test.ice
+++ b/cpp/test/Ice/retry/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/retry/TestI.cpp b/cpp/test/Ice/retry/TestI.cpp
index 8359a69654e..0f36df219d3 100644
--- a/cpp/test/Ice/retry/TestI.cpp
+++ b/cpp/test/Ice/retry/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/retry/TestI.h b/cpp/test/Ice/retry/TestI.h
index 1af097f8347..bc9eb032808 100644
--- a/cpp/test/Ice/retry/TestI.h
+++ b/cpp/test/Ice/retry/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/scope/AllTests.cpp b/cpp/test/Ice/scope/AllTests.cpp
index db6bdc9cc0a..5cb29e9e40e 100644
--- a/cpp/test/Ice/scope/AllTests.cpp
+++ b/cpp/test/Ice/scope/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/scope/Client.cpp b/cpp/test/Ice/scope/Client.cpp
index 8b8adc69da8..5eabc266a83 100644
--- a/cpp/test/Ice/scope/Client.cpp
+++ b/cpp/test/Ice/scope/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/scope/Server.cpp b/cpp/test/Ice/scope/Server.cpp
index 8f0746fa8b6..401cb01d1ca 100644
--- a/cpp/test/Ice/scope/Server.cpp
+++ b/cpp/test/Ice/scope/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/scope/Test.ice b/cpp/test/Ice/scope/Test.ice
index 371f529dade..278977e680b 100644
--- a/cpp/test/Ice/scope/Test.ice
+++ b/cpp/test/Ice/scope/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp
index 863a3eec0ca..cb726da7e12 100644
--- a/cpp/test/Ice/servantLocator/AllTests.cpp
+++ b/cpp/test/Ice/servantLocator/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp
index 83bac2d7998..972143cb0ea 100644
--- a/cpp/test/Ice/servantLocator/Client.cpp
+++ b/cpp/test/Ice/servantLocator/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index af266896cb5..2714e07060e 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/servantLocator/Makefile.mk b/cpp/test/Ice/servantLocator/Makefile.mk
index bf76e8f0652..62d5a9b7746 100644
--- a/cpp/test/Ice/servantLocator/Makefile.mk
+++ b/cpp/test/Ice/servantLocator/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = $(test-client-sources) ServantLocatorI.cpp
diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
index 3d4700dae10..6456f024276 100644
--- a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
+++ b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.h b/cpp/test/Ice/servantLocator/ServantLocatorI.h
index fe8da6dcd66..986c32e9ee8 100644
--- a/cpp/test/Ice/servantLocator/ServantLocatorI.h
+++ b/cpp/test/Ice/servantLocator/ServantLocatorI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SERVANT_LOCATOR_I_H
diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp
index 7dbc747dc3b..d7cad081d8c 100644
--- a/cpp/test/Ice/servantLocator/Server.cpp
+++ b/cpp/test/Ice/servantLocator/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp
index 8048b143495..d708f4fae6a 100644
--- a/cpp/test/Ice/servantLocator/ServerAMD.cpp
+++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <ServantLocatorI.h>
diff --git a/cpp/test/Ice/servantLocator/Test.ice b/cpp/test/Ice/servantLocator/Test.ice
index 377afc7872c..d09e2899fdd 100644
--- a/cpp/test/Ice/servantLocator/Test.ice
+++ b/cpp/test/Ice/servantLocator/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/TestAMD.ice b/cpp/test/Ice/servantLocator/TestAMD.ice
index d3e906174f3..f5e625cd8ea 100644
--- a/cpp/test/Ice/servantLocator/TestAMD.ice
+++ b/cpp/test/Ice/servantLocator/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/servantLocator/TestAMDI.cpp b/cpp/test/Ice/servantLocator/TestAMDI.cpp
index 101443547a6..f9292abc4b0 100644
--- a/cpp/test/Ice/servantLocator/TestAMDI.cpp
+++ b/cpp/test/Ice/servantLocator/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/servantLocator/TestAMDI.h b/cpp/test/Ice/servantLocator/TestAMDI.h
index 3e03770c2b9..27b2b39195f 100644
--- a/cpp/test/Ice/servantLocator/TestAMDI.h
+++ b/cpp/test/Ice/servantLocator/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTAMD_I_H
diff --git a/cpp/test/Ice/servantLocator/TestI.cpp b/cpp/test/Ice/servantLocator/TestI.cpp
index 391fa91344a..ac0ec44f906 100644
--- a/cpp/test/Ice/servantLocator/TestI.cpp
+++ b/cpp/test/Ice/servantLocator/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/servantLocator/TestI.h b/cpp/test/Ice/servantLocator/TestI.h
index 576c6ce8f15..1270894697c 100644
--- a/cpp/test/Ice/servantLocator/TestI.h
+++ b/cpp/test/Ice/servantLocator/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/services/AllTests.cpp b/cpp/test/Ice/services/AllTests.cpp
index 2f4880e45f9..d2bed35e92e 100644
--- a/cpp/test/Ice/services/AllTests.cpp
+++ b/cpp/test/Ice/services/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/services/Client.cpp b/cpp/test/Ice/services/Client.cpp
index 9790b063687..35058bb08f0 100644
--- a/cpp/test/Ice/services/Client.cpp
+++ b/cpp/test/Ice/services/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk
index bf843df0eca..0b93676d1b7 100644
--- a/cpp/test/Ice/services/Makefile.mk
+++ b/cpp/test/Ice/services/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = Glacier2 IceStorm IceGrid TestCommon IceSSL Ice
diff --git a/cpp/test/Ice/services/Test.ice b/cpp/test/Ice/services/Test.ice
index 2627ab05513..e96862a4dcb 100644
--- a/cpp/test/Ice/services/Test.ice
+++ b/cpp/test/Ice/services/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
index f2de7877c64..38678a1caec 100644
--- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index aad9263fac9..d4b443e7b7e 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
index f4c05287bf2..1c8c679241b 100644
--- a/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ClientPrivate.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk
index 7ad71f868b7..e744046ae74 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile.mk
+++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_sliceflags := -I$(test)
diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index 2b16946be83..90dfefed4b3 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
index 5ad24ab9cd5..0e0620903a1 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
index 976d617dd31..1a5f265cfe1 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 003f48a117c..61eadd9f44d 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice
index ed2112c41cd..a5bd83a10b5 100644
--- a/cpp/test/Ice/slicing/exceptions/Test.ice
+++ b/cpp/test/Ice/slicing/exceptions/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
index df97190f404..9d35f8f5f28 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index 99343ee857e..a8e1a9c58f0 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
index f4f9c6cc2e0..5879bd8531d 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTAMDI_H
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp
index b7e1d42db71..72c392145ab 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.h b/cpp/test/Ice/slicing/exceptions/TestI.h
index 43b8826259b..537843f3f17 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTI_H
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index caf7b27d4eb..de880b1279c 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index bf6f61fef02..435e0f40f3c 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
index 3b8622acd7b..d3a5e4252ac 100644
--- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk
index 5eb00b0a5d6..966beb1a793 100644
--- a/cpp/test/Ice/slicing/objects/Makefile.mk
+++ b/cpp/test/Ice/slicing/objects/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_sliceflags := -I$(test)
diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index bc3e5e051d1..5829beca8ab 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
index af6af60da07..6f82472d7e2 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivate.ice b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
index d7524ddbc81..9e1f77444ff 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
index 7762aff3493..be5e170c628 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice
index d3f9024933f..41f8b5401b9 100644
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice
index 627c19d79ef..706906ff05c 100644
--- a/cpp/test/Ice/slicing/objects/TestAMD.ice
+++ b/cpp/test/Ice/slicing/objects/TestAMD.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index 146a6609a5c..a3c4bf5a2f2 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h
index efd1892277c..2e525918f50 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.h
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTI_H
diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp
index 9b6dfa98436..312f22fdcb0 100644
--- a/cpp/test/Ice/slicing/objects/TestI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h
index 103ce75584c..337e3164155 100644
--- a/cpp/test/Ice/slicing/objects/TestI.h
+++ b/cpp/test/Ice/slicing/objects/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TESTI_H
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index 2a5dbcd55b9..fc723cfc691 100644
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifdef _MSC_VER
diff --git a/cpp/test/Ice/stream/Test.ice b/cpp/test/Ice/stream/Test.ice
index 3d23d655c57..8cb5ec438ec 100644
--- a/cpp/test/Ice/stream/Test.ice
+++ b/cpp/test/Ice/stream/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index 1dd7d40ac5a..6e70a92a6e8 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk
index ab2ff4fc13b..c57a06bdd22 100644
--- a/cpp/test/Ice/stringConverter/Makefile.mk
+++ b/cpp/test/Ice/stringConverter/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_ldflags = $(iconv_ldflags)
diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp
index 5469a72c997..63d85404efd 100644
--- a/cpp/test/Ice/stringConverter/Server.cpp
+++ b/cpp/test/Ice/stringConverter/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/stringConverter/Test.ice b/cpp/test/Ice/stringConverter/Test.ice
index 184917b2ea5..b2cbe890593 100644
--- a/cpp/test/Ice/stringConverter/Test.ice
+++ b/cpp/test/Ice/stringConverter/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/threadPoolPriority/AllTests.cpp b/cpp/test/Ice/threadPoolPriority/AllTests.cpp
index dc9b4a39f33..325c1960920 100644
--- a/cpp/test/Ice/threadPoolPriority/AllTests.cpp
+++ b/cpp/test/Ice/threadPoolPriority/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Client.cpp b/cpp/test/Ice/threadPoolPriority/Client.cpp
index 43ce70652e5..feddf370e0f 100644
--- a/cpp/test/Ice/threadPoolPriority/Client.cpp
+++ b/cpp/test/Ice/threadPoolPriority/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk
index 5494217a733..06fd699bc58 100644
--- a/cpp/test/Ice/threadPoolPriority/Makefile.mk
+++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs := client server servercustom
diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp
index ed92cbca768..7a5b6520d30 100644
--- a/cpp/test/Ice/threadPoolPriority/Server.cpp
+++ b/cpp/test/Ice/threadPoolPriority/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
index 56988afd404..676b2a717bd 100644
--- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
+++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/threadPoolPriority/Test.ice b/cpp/test/Ice/threadPoolPriority/Test.ice
index 9fdc3fc7a2e..bf918628948 100644
--- a/cpp/test/Ice/threadPoolPriority/Test.ice
+++ b/cpp/test/Ice/threadPoolPriority/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/threadPoolPriority/TestI.cpp b/cpp/test/Ice/threadPoolPriority/TestI.cpp
index 75bccb8521f..16f42cceaef 100644
--- a/cpp/test/Ice/threadPoolPriority/TestI.cpp
+++ b/cpp/test/Ice/threadPoolPriority/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/threadPoolPriority/TestI.h b/cpp/test/Ice/threadPoolPriority/TestI.h
index dea3ad67c65..06ff1b98fb5 100644
--- a/cpp/test/Ice/threadPoolPriority/TestI.h
+++ b/cpp/test/Ice/threadPoolPriority/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/threadPoolPriority/test.py b/cpp/test/Ice/threadPoolPriority/test.py
index d6152b1bfe0..4bd3ab451d1 100644
--- a/cpp/test/Ice/threadPoolPriority/test.py
+++ b/cpp/test/Ice/threadPoolPriority/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 03d98883390..d8c3d036a24 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp
index e978469b8e5..fa448d9abc1 100644
--- a/cpp/test/Ice/timeout/Client.cpp
+++ b/cpp/test/Ice/timeout/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/timeout/Makefile.mk b/cpp/test/Ice/timeout/Makefile.mk
index 94c660232d6..4d910135e76 100644
--- a/cpp/test/Ice/timeout/Makefile.mk
+++ b/cpp/test/Ice/timeout/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = $(test-client-sources) TestI.cpp
diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp
index 00d9b332507..7d5ea402723 100644
--- a/cpp/test/Ice/timeout/Server.cpp
+++ b/cpp/test/Ice/timeout/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/timeout/Test.ice b/cpp/test/Ice/timeout/Test.ice
index 36bdfdfef04..db6a9d326fb 100644
--- a/cpp/test/Ice/timeout/Test.ice
+++ b/cpp/test/Ice/timeout/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/timeout/TestI.cpp b/cpp/test/Ice/timeout/TestI.cpp
index 020c1d2ad03..dfbd44b37d6 100644
--- a/cpp/test/Ice/timeout/TestI.cpp
+++ b/cpp/test/Ice/timeout/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestI.h>
diff --git a/cpp/test/Ice/timeout/TestI.h b/cpp/test/Ice/timeout/TestI.h
index d19e2bf1b0c..60e7e27af36 100644
--- a/cpp/test/Ice/timeout/TestI.h
+++ b/cpp/test/Ice/timeout/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index 7d361ff65a5..3a56136ed1c 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/udp/Client.cpp b/cpp/test/Ice/udp/Client.cpp
index 67d7f540f9d..e0695fbf13a 100644
--- a/cpp/test/Ice/udp/Client.cpp
+++ b/cpp/test/Ice/udp/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp
index 0096ce7c748..ca98745f3b2 100644
--- a/cpp/test/Ice/udp/Server.cpp
+++ b/cpp/test/Ice/udp/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/udp/Test.ice b/cpp/test/Ice/udp/Test.ice
index a7030a117e8..bb031720e30 100644
--- a/cpp/test/Ice/udp/Test.ice
+++ b/cpp/test/Ice/udp/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp
index ff0bdb8691a..6674b6323cb 100644
--- a/cpp/test/Ice/udp/TestI.cpp
+++ b/cpp/test/Ice/udp/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/Ice/udp/TestI.h b/cpp/test/Ice/udp/TestI.h
index b37edc8e6a7..fe9098b77e3 100644
--- a/cpp/test/Ice/udp/TestI.h
+++ b/cpp/test/Ice/udp/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceBox/admin/AllTests.cpp b/cpp/test/IceBox/admin/AllTests.cpp
index dcf096645de..a6621d391aa 100644
--- a/cpp/test/IceBox/admin/AllTests.cpp
+++ b/cpp/test/IceBox/admin/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/admin/Client.cpp b/cpp/test/IceBox/admin/Client.cpp
index ec74e563381..5bc0756a241 100644
--- a/cpp/test/IceBox/admin/Client.cpp
+++ b/cpp/test/IceBox/admin/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk
index d8762322f27..60c7408f2a9 100644
--- a/cpp/test/IceBox/admin/Makefile.mk
+++ b/cpp/test/IceBox/admin/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceBox/admin/Service.cpp b/cpp/test/IceBox/admin/Service.cpp
index 17693da5e67..7571fffee5e 100644
--- a/cpp/test/IceBox/admin/Service.cpp
+++ b/cpp/test/IceBox/admin/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/admin/Test.ice b/cpp/test/IceBox/admin/Test.ice
index aba60ca759a..80c5e1f1b8d 100644
--- a/cpp/test/IceBox/admin/Test.ice
+++ b/cpp/test/IceBox/admin/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ICE
diff --git a/cpp/test/IceBox/admin/TestI.cpp b/cpp/test/IceBox/admin/TestI.cpp
index 99c9a31c619..b36c5cd02f7 100644
--- a/cpp/test/IceBox/admin/TestI.cpp
+++ b/cpp/test/IceBox/admin/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/admin/TestI.h b/cpp/test/IceBox/admin/TestI.h
index 966d9328652..6c30b2d73e8 100644
--- a/cpp/test/IceBox/admin/TestI.h
+++ b/cpp/test/IceBox/admin/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceBox/configuration/AllTests.cpp b/cpp/test/IceBox/configuration/AllTests.cpp
index f71b4b9bc9d..4697178b9e9 100644
--- a/cpp/test/IceBox/configuration/AllTests.cpp
+++ b/cpp/test/IceBox/configuration/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/configuration/Client.cpp b/cpp/test/IceBox/configuration/Client.cpp
index 2c9afb640c4..2298c47b811 100644
--- a/cpp/test/IceBox/configuration/Client.cpp
+++ b/cpp/test/IceBox/configuration/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk
index d8762322f27..60c7408f2a9 100644
--- a/cpp/test/IceBox/configuration/Makefile.mk
+++ b/cpp/test/IceBox/configuration/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceBox/configuration/Service.cpp b/cpp/test/IceBox/configuration/Service.cpp
index 5da6e787c6c..77ef1bc8706 100644
--- a/cpp/test/IceBox/configuration/Service.cpp
+++ b/cpp/test/IceBox/configuration/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/configuration/Test.ice b/cpp/test/IceBox/configuration/Test.ice
index 1b02fc837c8..bf9ad4f2ccb 100644
--- a/cpp/test/IceBox/configuration/Test.ice
+++ b/cpp/test/IceBox/configuration/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceBox/configuration/TestI.cpp b/cpp/test/IceBox/configuration/TestI.cpp
index 4db51adbd30..625db46c491 100644
--- a/cpp/test/IceBox/configuration/TestI.cpp
+++ b/cpp/test/IceBox/configuration/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBox/configuration/TestI.h b/cpp/test/IceBox/configuration/TestI.h
index 2fe194939a4..7cde66b63ad 100644
--- a/cpp/test/IceBox/configuration/TestI.h
+++ b/cpp/test/IceBox/configuration/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceBridge/simple/AllTests.cpp b/cpp/test/IceBridge/simple/AllTests.cpp
index 8e52ed1b60e..e29e57d2b55 100644
--- a/cpp/test/IceBridge/simple/AllTests.cpp
+++ b/cpp/test/IceBridge/simple/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBridge/simple/Client.cpp b/cpp/test/IceBridge/simple/Client.cpp
index 1f09524f0e7..e8b99a70e8a 100644
--- a/cpp/test/IceBridge/simple/Client.cpp
+++ b/cpp/test/IceBridge/simple/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBridge/simple/Server.cpp b/cpp/test/IceBridge/simple/Server.cpp
index 5b5cd40be73..351793c6562 100644
--- a/cpp/test/IceBridge/simple/Server.cpp
+++ b/cpp/test/IceBridge/simple/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBridge/simple/Test.ice b/cpp/test/IceBridge/simple/Test.ice
index 9324e137650..5709d52e811 100644
--- a/cpp/test/IceBridge/simple/Test.ice
+++ b/cpp/test/IceBridge/simple/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceBridge/simple/TestI.cpp b/cpp/test/IceBridge/simple/TestI.cpp
index e7bde266714..68857eb5b9f 100644
--- a/cpp/test/IceBridge/simple/TestI.cpp
+++ b/cpp/test/IceBridge/simple/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceBridge/simple/TestI.h b/cpp/test/IceBridge/simple/TestI.h
index f8635fdf838..ecd12354594 100644
--- a/cpp/test/IceBridge/simple/TestI.h
+++ b/cpp/test/IceBridge/simple/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceBridge/simple/test.py b/cpp/test/IceBridge/simple/test.py
index cd4692ebf18..5cf45ba998e 100644
--- a/cpp/test/IceBridge/simple/test.py
+++ b/cpp/test/IceBridge/simple/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__file__, [ClientServerTestCase(servers=[IceBridge(), Server()])])
diff --git a/cpp/test/IceDiscovery/simple/AllTests.cpp b/cpp/test/IceDiscovery/simple/AllTests.cpp
index fb7da171f2f..7f332cbfc8d 100644
--- a/cpp/test/IceDiscovery/simple/AllTests.cpp
+++ b/cpp/test/IceDiscovery/simple/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceDiscovery/simple/Client.cpp b/cpp/test/IceDiscovery/simple/Client.cpp
index 4ec03c7a2ee..e6fd3694b64 100644
--- a/cpp/test/IceDiscovery/simple/Client.cpp
+++ b/cpp/test/IceDiscovery/simple/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceDiscovery/simple/Makefile.mk b/cpp/test/IceDiscovery/simple/Makefile.mk
index 6c05552b2d8..d6e49f3650f 100644
--- a/cpp/test/IceDiscovery/simple/Makefile.mk
+++ b/cpp/test/IceDiscovery/simple/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = IceDiscovery TestCommon IceSSL Ice
diff --git a/cpp/test/IceDiscovery/simple/Server.cpp b/cpp/test/IceDiscovery/simple/Server.cpp
index 817172e259c..cb0d416acf0 100644
--- a/cpp/test/IceDiscovery/simple/Server.cpp
+++ b/cpp/test/IceDiscovery/simple/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceDiscovery/simple/Test.ice b/cpp/test/IceDiscovery/simple/Test.ice
index 388838e45ca..70767992eda 100644
--- a/cpp/test/IceDiscovery/simple/Test.ice
+++ b/cpp/test/IceDiscovery/simple/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceDiscovery/simple/TestI.cpp b/cpp/test/IceDiscovery/simple/TestI.cpp
index bd91d20d016..ae2290d4341 100644
--- a/cpp/test/IceDiscovery/simple/TestI.cpp
+++ b/cpp/test/IceDiscovery/simple/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceDiscovery/simple/TestI.h b/cpp/test/IceDiscovery/simple/TestI.h
index d0a53ab6cfd..f4ec7c90688 100644
--- a/cpp/test/IceDiscovery/simple/TestI.h
+++ b/cpp/test/IceDiscovery/simple/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp
index c07dbf377f8..867a246270a 100644
--- a/cpp/test/IceGrid/activation/AllTests.cpp
+++ b/cpp/test/IceGrid/activation/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/activation/Client.cpp b/cpp/test/IceGrid/activation/Client.cpp
index 225ff2be72d..1a24f916bf1 100644
--- a/cpp/test/IceGrid/activation/Client.cpp
+++ b/cpp/test/IceGrid/activation/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/activation/Makefile.mk b/cpp/test/IceGrid/activation/Makefile.mk
index 02da43be26c..799336c371c 100644
--- a/cpp/test/IceGrid/activation/Makefile.mk
+++ b/cpp/test/IceGrid/activation/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/activation/Server.cpp b/cpp/test/IceGrid/activation/Server.cpp
index 2b15ea749dc..74a9b72a5c3 100644
--- a/cpp/test/IceGrid/activation/Server.cpp
+++ b/cpp/test/IceGrid/activation/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/activation/Test.ice b/cpp/test/IceGrid/activation/Test.ice
index 8e25d14a0d2..5632195c229 100644
--- a/cpp/test/IceGrid/activation/Test.ice
+++ b/cpp/test/IceGrid/activation/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/activation/TestI.cpp b/cpp/test/IceGrid/activation/TestI.cpp
index ad37420421c..81f9a8fea1f 100644
--- a/cpp/test/IceGrid/activation/TestI.cpp
+++ b/cpp/test/IceGrid/activation/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/activation/TestI.h b/cpp/test/IceGrid/activation/TestI.h
index db4a1e906ee..2c99a01ba73 100644
--- a/cpp/test/IceGrid/activation/TestI.h
+++ b/cpp/test/IceGrid/activation/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/activation/test.py b/cpp/test/IceGrid/activation/test.py
index 26da2666858..6aef5ddc961 100644
--- a/cpp/test/IceGrid/activation/test.py
+++ b/cpp/test/IceGrid/activation/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
diff --git a/cpp/test/IceGrid/admin/Makefile.mk b/cpp/test/IceGrid/admin/Makefile.mk
index 3233807006e..35080fff73b 100644
--- a/cpp/test/IceGrid/admin/Makefile.mk
+++ b/cpp/test/IceGrid/admin/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
# This Makefile.mk is necessary to get this test to build because the
diff --git a/cpp/test/IceGrid/admin/Server.cpp b/cpp/test/IceGrid/admin/Server.cpp
index 4ee0de5331d..ca0cd93cb30 100644
--- a/cpp/test/IceGrid/admin/Server.cpp
+++ b/cpp/test/IceGrid/admin/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py
index b6ff2ba03d7..14ce5b42f53 100644
--- a/cpp/test/IceGrid/admin/test.py
+++ b/cpp/test/IceGrid/admin/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridAdminTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp
index 8a226a01517..ac3b407b8c3 100644
--- a/cpp/test/IceGrid/allocation/AllTests.cpp
+++ b/cpp/test/IceGrid/allocation/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/allocation/Client.cpp b/cpp/test/IceGrid/allocation/Client.cpp
index 314d2c8b7a1..743ca53baac 100644
--- a/cpp/test/IceGrid/allocation/Client.cpp
+++ b/cpp/test/IceGrid/allocation/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk
index d57dc6f9e83..a0a32c03802 100644
--- a/cpp/test/IceGrid/allocation/Makefile.mk
+++ b/cpp/test/IceGrid/allocation/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = client server verifier
diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
index 8a844545e77..80bcd1703e5 100644
--- a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
+++ b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/allocation/Server.cpp b/cpp/test/IceGrid/allocation/Server.cpp
index 0fa2438e488..2f5d39c6747 100644
--- a/cpp/test/IceGrid/allocation/Server.cpp
+++ b/cpp/test/IceGrid/allocation/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/allocation/Test.ice b/cpp/test/IceGrid/allocation/Test.ice
index 3a1b7e2f214..9db9b3e1c39 100644
--- a/cpp/test/IceGrid/allocation/Test.ice
+++ b/cpp/test/IceGrid/allocation/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/allocation/TestI.cpp b/cpp/test/IceGrid/allocation/TestI.cpp
index 65e7039c700..a936b3927e2 100644
--- a/cpp/test/IceGrid/allocation/TestI.cpp
+++ b/cpp/test/IceGrid/allocation/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/allocation/TestI.h b/cpp/test/IceGrid/allocation/TestI.h
index e1caeb5abef..34edefc5fb1 100644
--- a/cpp/test/IceGrid/allocation/TestI.h
+++ b/cpp/test/IceGrid/allocation/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/allocation/test.py b/cpp/test/IceGrid/allocation/test.py
index 25016c8ec3e..7d38fba52cf 100644
--- a/cpp/test/IceGrid/allocation/test.py
+++ b/cpp/test/IceGrid/allocation/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp
index 93d54162bf8..d85a9f14b8a 100644
--- a/cpp/test/IceGrid/deployer/AllTests.cpp
+++ b/cpp/test/IceGrid/deployer/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/deployer/Client.cpp b/cpp/test/IceGrid/deployer/Client.cpp
index 866eca806eb..dc223707c8c 100644
--- a/cpp/test/IceGrid/deployer/Client.cpp
+++ b/cpp/test/IceGrid/deployer/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk
index aa7bb05d90a..ee879164c62 100644
--- a/cpp/test/IceGrid/deployer/Makefile.mk
+++ b/cpp/test/IceGrid/deployer/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp
index 69e50bb115c..f27ca0aade3 100644
--- a/cpp/test/IceGrid/deployer/Server.cpp
+++ b/cpp/test/IceGrid/deployer/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/DisableWarnings.h>
diff --git a/cpp/test/IceGrid/deployer/Service.cpp b/cpp/test/IceGrid/deployer/Service.cpp
index ffc82d5a614..056e35033a2 100644
--- a/cpp/test/IceGrid/deployer/Service.cpp
+++ b/cpp/test/IceGrid/deployer/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/deployer/Test.ice b/cpp/test/IceGrid/deployer/Test.ice
index 3a1b7e2f214..9db9b3e1c39 100644
--- a/cpp/test/IceGrid/deployer/Test.ice
+++ b/cpp/test/IceGrid/deployer/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/deployer/TestI.cpp b/cpp/test/IceGrid/deployer/TestI.cpp
index 65e7039c700..a936b3927e2 100644
--- a/cpp/test/IceGrid/deployer/TestI.cpp
+++ b/cpp/test/IceGrid/deployer/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/deployer/TestI.h b/cpp/test/IceGrid/deployer/TestI.h
index e1caeb5abef..34edefc5fb1 100644
--- a/cpp/test/IceGrid/deployer/TestI.h
+++ b/cpp/test/IceGrid/deployer/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/deployer/test.py b/cpp/test/IceGrid/deployer/test.py
index d36c09874fa..a02a3c08290 100644
--- a/cpp/test/IceGrid/deployer/test.py
+++ b/cpp/test/IceGrid/deployer/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
clientProps=lambda process, current: { "TestDir" : current.getBuildDir("server") }
diff --git a/cpp/test/IceGrid/distribution/AllTests.cpp b/cpp/test/IceGrid/distribution/AllTests.cpp
index a48abcc2d2b..b521c3116f0 100644
--- a/cpp/test/IceGrid/distribution/AllTests.cpp
+++ b/cpp/test/IceGrid/distribution/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/distribution/Client.cpp b/cpp/test/IceGrid/distribution/Client.cpp
index 314d2c8b7a1..743ca53baac 100644
--- a/cpp/test/IceGrid/distribution/Client.cpp
+++ b/cpp/test/IceGrid/distribution/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/distribution/Makefile.mk b/cpp/test/IceGrid/distribution/Makefile.mk
index 02da43be26c..799336c371c 100644
--- a/cpp/test/IceGrid/distribution/Makefile.mk
+++ b/cpp/test/IceGrid/distribution/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/distribution/Server.cpp b/cpp/test/IceGrid/distribution/Server.cpp
index efdf2192c5f..59aba9d4642 100644
--- a/cpp/test/IceGrid/distribution/Server.cpp
+++ b/cpp/test/IceGrid/distribution/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/distribution/Test.ice b/cpp/test/IceGrid/distribution/Test.ice
index 649feaa1dcb..6ca36bbe730 100644
--- a/cpp/test/IceGrid/distribution/Test.ice
+++ b/cpp/test/IceGrid/distribution/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/distribution/TestI.cpp b/cpp/test/IceGrid/distribution/TestI.cpp
index 7192206fb7d..4702debd5aa 100644
--- a/cpp/test/IceGrid/distribution/TestI.cpp
+++ b/cpp/test/IceGrid/distribution/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/distribution/TestI.h b/cpp/test/IceGrid/distribution/TestI.h
index 8a0185dc131..5828913f6f5 100644
--- a/cpp/test/IceGrid/distribution/TestI.h
+++ b/cpp/test/IceGrid/distribution/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/distribution/test.py b/cpp/test/IceGrid/distribution/test.py
index 48972c356a6..c774ee99174 100644
--- a/cpp/test/IceGrid/distribution/test.py
+++ b/cpp/test/IceGrid/distribution/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridDistributionTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py
index ec95268a277..ba0a4507a0d 100644
--- a/cpp/test/IceGrid/fileLock/test.py
+++ b/cpp/test/IceGrid/fileLock/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridAdminTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
index 98045ecbf34..62e07ff1353 100644
--- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Client.cpp b/cpp/test/IceGrid/noRestartUpdate/Client.cpp
index 314d2c8b7a1..743ca53baac 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Client.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
index aa7bb05d90a..ee879164c62 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
+++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestService
diff --git a/cpp/test/IceGrid/noRestartUpdate/Server.cpp b/cpp/test/IceGrid/noRestartUpdate/Server.cpp
index c46f3484bae..671cb596927 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Server.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp
index 6beaa82ebde..048889c5004 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/Test.ice b/cpp/test/IceGrid/noRestartUpdate/Test.ice
index 71042b9165e..e040cacd346 100644
--- a/cpp/test/IceGrid/noRestartUpdate/Test.ice
+++ b/cpp/test/IceGrid/noRestartUpdate/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_ICE
diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
index c1651a663c2..ece378d9ca7 100644
--- a/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/noRestartUpdate/TestI.h b/cpp/test/IceGrid/noRestartUpdate/TestI.h
index 5ab28973771..09330169cf6 100644
--- a/cpp/test/IceGrid/noRestartUpdate/TestI.h
+++ b/cpp/test/IceGrid/noRestartUpdate/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py
index eb4f3ecf1d1..d9847ed5ce9 100644
--- a/cpp/test/IceGrid/noRestartUpdate/test.py
+++ b/cpp/test/IceGrid/noRestartUpdate/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridNoRestartUpdateTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
index ca469694a04..e701631f159 100644
--- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp
+++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Client.cpp b/cpp/test/IceGrid/replicaGroup/Client.cpp
index d0854845b3f..360928642fd 100644
--- a/cpp/test/IceGrid/replicaGroup/Client.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk
index 2d94a705731..7e194f74324 100644
--- a/cpp/test/IceGrid/replicaGroup/Makefile.mk
+++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_libraries := $(test)_TestService $(test)_RegistryPlugin
diff --git a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
index 7c63e6edcce..111c4627900 100644
--- a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
+++ b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Server.cpp b/cpp/test/IceGrid/replicaGroup/Server.cpp
index ec5191f44cd..31a618a5c98 100644
--- a/cpp/test/IceGrid/replicaGroup/Server.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Service.cpp b/cpp/test/IceGrid/replicaGroup/Service.cpp
index a79d0c06c81..f22f9c3bd02 100644
--- a/cpp/test/IceGrid/replicaGroup/Service.cpp
+++ b/cpp/test/IceGrid/replicaGroup/Service.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/Test.ice b/cpp/test/IceGrid/replicaGroup/Test.ice
index 42b01cd9d28..7b64660a608 100644
--- a/cpp/test/IceGrid/replicaGroup/Test.ice
+++ b/cpp/test/IceGrid/replicaGroup/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/replicaGroup/TestI.cpp b/cpp/test/IceGrid/replicaGroup/TestI.cpp
index 4b031e6bfe1..14925171fa9 100644
--- a/cpp/test/IceGrid/replicaGroup/TestI.cpp
+++ b/cpp/test/IceGrid/replicaGroup/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replicaGroup/TestI.h b/cpp/test/IceGrid/replicaGroup/TestI.h
index 4bf640d0aed..20954055aaf 100644
--- a/cpp/test/IceGrid/replicaGroup/TestI.h
+++ b/cpp/test/IceGrid/replicaGroup/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/replicaGroup/test.py b/cpp/test/IceGrid/replicaGroup/test.py
index 17cb461038d..c73655eb825 100644
--- a/cpp/test/IceGrid/replicaGroup/test.py
+++ b/cpp/test/IceGrid/replicaGroup/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
registryProps = {
diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp
index e11fc95fc41..791ab541eb5 100644
--- a/cpp/test/IceGrid/replication/AllTests.cpp
+++ b/cpp/test/IceGrid/replication/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replication/Client.cpp b/cpp/test/IceGrid/replication/Client.cpp
index 314d2c8b7a1..743ca53baac 100644
--- a/cpp/test/IceGrid/replication/Client.cpp
+++ b/cpp/test/IceGrid/replication/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replication/Makefile.mk b/cpp/test/IceGrid/replication/Makefile.mk
index 02da43be26c..799336c371c 100644
--- a/cpp/test/IceGrid/replication/Makefile.mk
+++ b/cpp/test/IceGrid/replication/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/replication/Server.cpp b/cpp/test/IceGrid/replication/Server.cpp
index a2ada2d7ecc..a937460f600 100644
--- a/cpp/test/IceGrid/replication/Server.cpp
+++ b/cpp/test/IceGrid/replication/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replication/Test.ice b/cpp/test/IceGrid/replication/Test.ice
index bd857b935e0..a2b4678e707 100644
--- a/cpp/test/IceGrid/replication/Test.ice
+++ b/cpp/test/IceGrid/replication/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/replication/TestI.cpp b/cpp/test/IceGrid/replication/TestI.cpp
index 342df51d1cd..065db88dbbd 100644
--- a/cpp/test/IceGrid/replication/TestI.cpp
+++ b/cpp/test/IceGrid/replication/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/replication/TestI.h b/cpp/test/IceGrid/replication/TestI.h
index 3748d61f66c..3a73304a2d1 100644
--- a/cpp/test/IceGrid/replication/TestI.h
+++ b/cpp/test/IceGrid/replication/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/replication/test.py b/cpp/test/IceGrid/replication/test.py
index 641547bdd38..c32776c1111 100644
--- a/cpp/test/IceGrid/replication/test.py
+++ b/cpp/test/IceGrid/replication/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
clientProps = lambda process, current: { "ServerDir" : current.getBuildDir("server") }
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index faffaf66e7a..e4f959f89cb 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp
index e00ea97a457..475057c1a5d 100644
--- a/cpp/test/IceGrid/session/Client.cpp
+++ b/cpp/test/IceGrid/session/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk
index 5dcc0cac0d1..91692a368e0 100644
--- a/cpp/test/IceGrid/session/Makefile.mk
+++ b/cpp/test/IceGrid/session/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = client server verifier
diff --git a/cpp/test/IceGrid/session/PermissionsVerifier.cpp b/cpp/test/IceGrid/session/PermissionsVerifier.cpp
index 530a499fcaa..5434ca09bec 100644
--- a/cpp/test/IceGrid/session/PermissionsVerifier.cpp
+++ b/cpp/test/IceGrid/session/PermissionsVerifier.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp
index e9b22f71a15..0883546aac4 100644
--- a/cpp/test/IceGrid/session/Server.cpp
+++ b/cpp/test/IceGrid/session/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/session/Test.ice b/cpp/test/IceGrid/session/Test.ice
index 6ed579f575f..20bbaf485fa 100644
--- a/cpp/test/IceGrid/session/Test.ice
+++ b/cpp/test/IceGrid/session/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py
index ce1a8ffcff0..72a9e679c35 100644
--- a/cpp/test/IceGrid/session/test.py
+++ b/cpp/test/IceGrid/session/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridSessionTestCase(IceGridTestCase):
diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp
index 35a35e45c10..68e4ee1fae8 100644
--- a/cpp/test/IceGrid/simple/AllTests.cpp
+++ b/cpp/test/IceGrid/simple/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceGrid/simple/Client.cpp b/cpp/test/IceGrid/simple/Client.cpp
index 5ead4c000cc..14b08d9c809 100644
--- a/cpp/test/IceGrid/simple/Client.cpp
+++ b/cpp/test/IceGrid/simple/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk
index f9e6a342bf5..52ad63a9916 100644
--- a/cpp/test/IceGrid/simple/Makefile.mk
+++ b/cpp/test/IceGrid/simple/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 TestCommon IceSSL Ice
diff --git a/cpp/test/IceGrid/simple/Server.cpp b/cpp/test/IceGrid/simple/Server.cpp
index 563b1d04cd1..a439e8d32a6 100644
--- a/cpp/test/IceGrid/simple/Server.cpp
+++ b/cpp/test/IceGrid/simple/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/simple/Test.ice b/cpp/test/IceGrid/simple/Test.ice
index 2055861712a..3bbeb49af45 100644
--- a/cpp/test/IceGrid/simple/Test.ice
+++ b/cpp/test/IceGrid/simple/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/simple/TestI.cpp b/cpp/test/IceGrid/simple/TestI.cpp
index c2ecdd743c4..054d051935c 100644
--- a/cpp/test/IceGrid/simple/TestI.cpp
+++ b/cpp/test/IceGrid/simple/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/simple/TestI.h b/cpp/test/IceGrid/simple/TestI.h
index f250a3499dc..538b0231b34 100644
--- a/cpp/test/IceGrid/simple/TestI.h
+++ b/cpp/test/IceGrid/simple/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index a537bb89a5b..3ab140771c0 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceGrid/update/Client.cpp b/cpp/test/IceGrid/update/Client.cpp
index 314d2c8b7a1..743ca53baac 100644
--- a/cpp/test/IceGrid/update/Client.cpp
+++ b/cpp/test/IceGrid/update/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/update/Makefile.mk b/cpp/test/IceGrid/update/Makefile.mk
index 02da43be26c..799336c371c 100644
--- a/cpp/test/IceGrid/update/Makefile.mk
+++ b/cpp/test/IceGrid/update/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_dependencies = IceGrid Glacier2
diff --git a/cpp/test/IceGrid/update/Server.cpp b/cpp/test/IceGrid/update/Server.cpp
index 6dcf5a59a37..ab7be65daba 100644
--- a/cpp/test/IceGrid/update/Server.cpp
+++ b/cpp/test/IceGrid/update/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/update/Test.ice b/cpp/test/IceGrid/update/Test.ice
index 3a1b7e2f214..9db9b3e1c39 100644
--- a/cpp/test/IceGrid/update/Test.ice
+++ b/cpp/test/IceGrid/update/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceGrid/update/TestI.cpp b/cpp/test/IceGrid/update/TestI.cpp
index 65e7039c700..a936b3927e2 100644
--- a/cpp/test/IceGrid/update/TestI.cpp
+++ b/cpp/test/IceGrid/update/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceGrid/update/TestI.h b/cpp/test/IceGrid/update/TestI.h
index e1caeb5abef..34edefc5fb1 100644
--- a/cpp/test/IceGrid/update/TestI.h
+++ b/cpp/test/IceGrid/update/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py
index e3b870f6651..3d7efc9e96e 100644
--- a/cpp/test/IceGrid/update/test.py
+++ b/cpp/test/IceGrid/update/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceGridUpdateTestCase(IceGridTestCase):
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 0e6888610a5..349fa08425b 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp
index 2af310e56b7..0359303bc35 100644
--- a/cpp/test/IceSSL/configuration/Client.cpp
+++ b/cpp/test/IceSSL/configuration/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk
index 3fab386662a..16beb9c11cb 100644
--- a/cpp/test/IceSSL/configuration/Makefile.mk
+++ b/cpp/test/IceSSL/configuration/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = TestCommon IceSSL Ice
diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp
index 52a3ec36df2..010f68c4cb5 100644
--- a/cpp/test/IceSSL/configuration/Server.cpp
+++ b/cpp/test/IceSSL/configuration/Server.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceSSL/configuration/Test.ice b/cpp/test/IceSSL/configuration/Test.ice
index de26286ef47..29d9e7bc289 100644
--- a/cpp/test/IceSSL/configuration/Test.ice
+++ b/cpp/test/IceSSL/configuration/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp
index 9f9ca102381..e055b8d038f 100644
--- a/cpp/test/IceSSL/configuration/TestI.cpp
+++ b/cpp/test/IceSSL/configuration/TestI.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceSSL/configuration/TestI.h b/cpp/test/IceSSL/configuration/TestI.h
index b91c998e16e..609cec6dde2 100644
--- a/cpp/test/IceSSL/configuration/TestI.h
+++ b/cpp/test/IceSSL/configuration/TestI.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_I_H
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index e7fde6ce668..f6ce4860c60 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk
index 3ab466586a3..be1a57819b0 100644
--- a/cpp/test/IceStorm/federation/Makefile.mk
+++ b/cpp/test/IceStorm/federation/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index 1dc69381612..29df4219a1f 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index d2aa3411d1c..d0db5661b64 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/federation/test.py b/cpp/test/IceStorm/federation/test.py
index 47521c85158..e3a036599e1 100644
--- a/cpp/test/IceStorm/federation/test.py
+++ b/cpp/test/IceStorm/federation/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
class IceStormFederationTestCase(IceStormTestCase):
diff --git a/cpp/test/IceStorm/federation2/Event.ice b/cpp/test/IceStorm/federation2/Event.ice
index e7fde6ce668..f6ce4860c60 100644
--- a/cpp/test/IceStorm/federation2/Event.ice
+++ b/cpp/test/IceStorm/federation2/Event.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk
index 97deee19f06..41ce787cef1 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mk
+++ b/cpp/test/IceStorm/federation2/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber
diff --git a/cpp/test/IceStorm/federation2/Publisher.cpp b/cpp/test/IceStorm/federation2/Publisher.cpp
index 2441785460d..b966a4b2d75 100644
--- a/cpp/test/IceStorm/federation2/Publisher.cpp
+++ b/cpp/test/IceStorm/federation2/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/federation2/Subscriber.cpp b/cpp/test/IceStorm/federation2/Subscriber.cpp
index 842f446921b..110852c3296 100644
--- a/cpp/test/IceStorm/federation2/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation2/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/federation2/test.py b/cpp/test/IceStorm/federation2/test.py
index 2517da6856e..fdf2f39e9d1 100644
--- a/cpp/test/IceStorm/federation2/test.py
+++ b/cpp/test/IceStorm/federation2/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/IceStorm/persistent/Client.cpp b/cpp/test/IceStorm/persistent/Client.cpp
index 8b8bb5ba6d3..4db529395c8 100644
--- a/cpp/test/IceStorm/persistent/Client.cpp
+++ b/cpp/test/IceStorm/persistent/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/persistent/Makefile.mk b/cpp/test/IceStorm/persistent/Makefile.mk
index e954e650909..08b03ba4b7f 100644
--- a/cpp/test/IceStorm/persistent/Makefile.mk
+++ b/cpp/test/IceStorm/persistent/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = client
diff --git a/cpp/test/IceStorm/persistent/test.py b/cpp/test/IceStorm/persistent/test.py
index 3ccd82a96fa..6e71b3ea0f8 100644
--- a/cpp/test/IceStorm/persistent/test.py
+++ b/cpp/test/IceStorm/persistent/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
icestorm1 = IceStorm(createDb=True, cleanDb=False)
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
index 4d1b15abef2..d58748369cf 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mk
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber sub
diff --git a/cpp/test/IceStorm/rep1/Publisher.cpp b/cpp/test/IceStorm/rep1/Publisher.cpp
index 7dbf91e8cd1..7cb95220dc9 100644
--- a/cpp/test/IceStorm/rep1/Publisher.cpp
+++ b/cpp/test/IceStorm/rep1/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/rep1/Single.ice b/cpp/test/IceStorm/rep1/Single.ice
index af7ee445310..aa258f27b12 100644
--- a/cpp/test/IceStorm/rep1/Single.ice
+++ b/cpp/test/IceStorm/rep1/Single.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/rep1/Sub.cpp b/cpp/test/IceStorm/rep1/Sub.cpp
index c98700f2593..33f5b0e73c5 100644
--- a/cpp/test/IceStorm/rep1/Sub.cpp
+++ b/cpp/test/IceStorm/rep1/Sub.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/rep1/Subscriber.cpp b/cpp/test/IceStorm/rep1/Subscriber.cpp
index 829417e4f9d..a8046e59187 100644
--- a/cpp/test/IceStorm/rep1/Subscriber.cpp
+++ b/cpp/test/IceStorm/rep1/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/rep1/test.py b/cpp/test/IceStorm/rep1/test.py
index 44fa5160445..bcc3a585994 100644
--- a/cpp/test/IceStorm/rep1/test.py
+++ b/cpp/test/IceStorm/rep1/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/IceStorm/repgrid/Client.cpp b/cpp/test/IceStorm/repgrid/Client.cpp
index 8a72011a124..29dcaec120c 100644
--- a/cpp/test/IceStorm/repgrid/Client.cpp
+++ b/cpp/test/IceStorm/repgrid/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk
index a73b554e6eb..c2b772b4cb9 100644
--- a/cpp/test/IceStorm/repgrid/Makefile.mk
+++ b/cpp/test/IceStorm/repgrid/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_dependencies = IceStorm Ice TestCommon
diff --git a/cpp/test/IceStorm/repgrid/Single.ice b/cpp/test/IceStorm/repgrid/Single.ice
index af7ee445310..aa258f27b12 100644
--- a/cpp/test/IceStorm/repgrid/Single.ice
+++ b/cpp/test/IceStorm/repgrid/Single.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index 44b8da282d2..d959e8e3768 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -3,9 +3,6 @@
Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
**********************************************************************
-->
diff --git a/cpp/test/IceStorm/repgrid/test.py b/cpp/test/IceStorm/repgrid/test.py
index 3529fc824e3..8be50dd6825 100644
--- a/cpp/test/IceStorm/repgrid/test.py
+++ b/cpp/test/IceStorm/repgrid/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
if isinstance(platform, Windows) or os.getuid() != 0:
diff --git a/cpp/test/IceStorm/repstress/Control.cpp b/cpp/test/IceStorm/repstress/Control.cpp
index 349582124ed..32078d0b56c 100644
--- a/cpp/test/IceStorm/repstress/Control.cpp
+++ b/cpp/test/IceStorm/repstress/Control.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/repstress/Controller.ice b/cpp/test/IceStorm/repstress/Controller.ice
index a4f1209dbd7..629cd933e43 100644
--- a/cpp/test/IceStorm/repstress/Controller.ice
+++ b/cpp/test/IceStorm/repstress/Controller.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk
index c65561a6a7d..69fc850f1f4 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mk
+++ b/cpp/test/IceStorm/repstress/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber control
diff --git a/cpp/test/IceStorm/repstress/Publisher.cpp b/cpp/test/IceStorm/repstress/Publisher.cpp
index 65aa6f2c9f9..c92f74df08d 100644
--- a/cpp/test/IceStorm/repstress/Publisher.cpp
+++ b/cpp/test/IceStorm/repstress/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/repstress/Single.ice b/cpp/test/IceStorm/repstress/Single.ice
index af7ee445310..aa258f27b12 100644
--- a/cpp/test/IceStorm/repstress/Single.ice
+++ b/cpp/test/IceStorm/repstress/Single.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/repstress/Subscriber.cpp b/cpp/test/IceStorm/repstress/Subscriber.cpp
index 4a6281e03b4..f226460f682 100644
--- a/cpp/test/IceStorm/repstress/Subscriber.cpp
+++ b/cpp/test/IceStorm/repstress/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py
index 13ba62f1ccf..4dadc84164c 100644
--- a/cpp/test/IceStorm/repstress/test.py
+++ b/cpp/test/IceStorm/repstress/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk
index def8469316a..91cabdca76c 100644
--- a/cpp/test/IceStorm/single/Makefile.mk
+++ b/cpp/test/IceStorm/single/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index f3224b39810..85a71d076f4 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index af7ee445310..aa258f27b12 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index d1399612552..b419d77680c 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/single/test.py b/cpp/test/IceStorm/single/test.py
index fadcee8aa9d..f05e65cd40d 100644
--- a/cpp/test/IceStorm/single/test.py
+++ b/cpp/test/IceStorm/single/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/IceStorm/stress/Event.ice b/cpp/test/IceStorm/stress/Event.ice
index b1f6b82b433..aa60f6f7721 100644
--- a/cpp/test/IceStorm/stress/Event.ice
+++ b/cpp/test/IceStorm/stress/Event.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk
index 09c54d5751e..602b04ce532 100644
--- a/cpp/test/IceStorm/stress/Makefile.mk
+++ b/cpp/test/IceStorm/stress/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_programs = publisher subscriber
diff --git a/cpp/test/IceStorm/stress/Publisher.cpp b/cpp/test/IceStorm/stress/Publisher.cpp
index 1f27dae93a8..a948ce186d0 100644
--- a/cpp/test/IceStorm/stress/Publisher.cpp
+++ b/cpp/test/IceStorm/stress/Publisher.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp
index 8c19cefbfa1..d81f9b3a325 100644
--- a/cpp/test/IceStorm/stress/Subscriber.cpp
+++ b/cpp/test/IceStorm/stress/Subscriber.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/IceStorm/stress/test.py b/cpp/test/IceStorm/stress/test.py
index 81263008380..11ad4257486 100644
--- a/cpp/test/IceStorm/stress/test.py
+++ b/cpp/test/IceStorm/stress/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
#
diff --git a/cpp/test/IceUtil/ctrlCHandler/Client.cpp b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
index 4be666bc1ab..d3fdf2515e2 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Client.cpp
+++ b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestHelper.h>
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
index ecaf8453f45..fa8fb466264 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
+++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
tests += $(test)
diff --git a/cpp/test/IceUtil/ctrlCHandler/test.py b/cpp/test/IceUtil/ctrlCHandler/test.py
index 9433f58576c..72e5406bdd7 100644
--- a/cpp/test/IceUtil/ctrlCHandler/test.py
+++ b/cpp/test/IceUtil/ctrlCHandler/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
# Dummy file to not run this test which is only ran manually.
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 85133413bcf..df202be9ca9 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/InputUtil.h>
diff --git a/cpp/test/IceUtil/priority/Client.cpp b/cpp/test/IceUtil/priority/Client.cpp
index f8ddcc1c2c5..c6886413837 100644
--- a/cpp/test/IceUtil/priority/Client.cpp
+++ b/cpp/test/IceUtil/priority/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/Makefile.mk b/cpp/test/IceUtil/priority/Makefile.mk
index 2e30073420a..76a975ceb4b 100644
--- a/cpp/test/IceUtil/priority/Makefile.mk
+++ b/cpp/test/IceUtil/priority/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp
index 38bcee1d013..0cc6856fcc4 100644
--- a/cpp/test/IceUtil/priority/PriorityInversion.cpp
+++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <PriorityInversion.h>
diff --git a/cpp/test/IceUtil/priority/PriorityInversion.h b/cpp/test/IceUtil/priority/PriorityInversion.h
index 7ad9196317a..b59a695f006 100644
--- a/cpp/test/IceUtil/priority/PriorityInversion.h
+++ b/cpp/test/IceUtil/priority/PriorityInversion.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef PRIORITY_INVERSION_TEST_H
diff --git a/cpp/test/IceUtil/priority/TestBase.cpp b/cpp/test/IceUtil/priority/TestBase.cpp
index e4373754100..3d6da074efb 100644
--- a/cpp/test/IceUtil/priority/TestBase.cpp
+++ b/cpp/test/IceUtil/priority/TestBase.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/TestBase.h b/cpp/test/IceUtil/priority/TestBase.h
index b72d62b1493..63bae0e33f8 100644
--- a/cpp/test/IceUtil/priority/TestBase.h
+++ b/cpp/test/IceUtil/priority/TestBase.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_BASE_H
diff --git a/cpp/test/IceUtil/priority/TestSuite.cpp b/cpp/test/IceUtil/priority/TestSuite.cpp
index e947641ab3c..191a8a07bef 100644
--- a/cpp/test/IceUtil/priority/TestSuite.cpp
+++ b/cpp/test/IceUtil/priority/TestSuite.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/MutexProtocol.h>
diff --git a/cpp/test/IceUtil/priority/TestSuite.h b/cpp/test/IceUtil/priority/TestSuite.h
index 2d8d52cad06..4099bb006f4 100644
--- a/cpp/test/IceUtil/priority/TestSuite.h
+++ b/cpp/test/IceUtil/priority/TestSuite.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_SUITE_H
diff --git a/cpp/test/IceUtil/priority/ThreadPriority.cpp b/cpp/test/IceUtil/priority/ThreadPriority.cpp
index 79ce46f5cc0..6609e3e1e1b 100644
--- a/cpp/test/IceUtil/priority/ThreadPriority.cpp
+++ b/cpp/test/IceUtil/priority/ThreadPriority.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/ThreadPriority.h b/cpp/test/IceUtil/priority/ThreadPriority.h
index 120e98fb97f..0e6594e5232 100644
--- a/cpp/test/IceUtil/priority/ThreadPriority.h
+++ b/cpp/test/IceUtil/priority/ThreadPriority.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef THREAD_PRIORITY_TEST_H
diff --git a/cpp/test/IceUtil/priority/TimerPriority.cpp b/cpp/test/IceUtil/priority/TimerPriority.cpp
index 18067d64b2f..0581411a276 100644
--- a/cpp/test/IceUtil/priority/TimerPriority.cpp
+++ b/cpp/test/IceUtil/priority/TimerPriority.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/priority/TimerPriority.h b/cpp/test/IceUtil/priority/TimerPriority.h
index 7cb3be4e496..c7ada13f602 100644
--- a/cpp/test/IceUtil/priority/TimerPriority.h
+++ b/cpp/test/IceUtil/priority/TimerPriority.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TIMER_PRIORITY_TEST_H
diff --git a/cpp/test/IceUtil/priority/test.py b/cpp/test/IceUtil/priority/test.py
index 6370a063e8e..fa05a1311c9 100644
--- a/cpp/test/IceUtil/priority/test.py
+++ b/cpp/test/IceUtil/priority/test.py
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
if not isinstance(platform, Darwin) and (isinstance(platform, Windows) or os.getuid() == 0):
diff --git a/cpp/test/IceUtil/sha1/Client.cpp b/cpp/test/IceUtil/sha1/Client.cpp
index 8ca38ebaedb..ee4a27c414d 100644
--- a/cpp/test/IceUtil/sha1/Client.cpp
+++ b/cpp/test/IceUtil/sha1/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/SHA1.h>
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp
index e50cd1ff7a7..7ae31f6ab7d 100644
--- a/cpp/test/IceUtil/stacktrace/Client.cpp
+++ b/cpp/test/IceUtil/stacktrace/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/StringUtil.h>
diff --git a/cpp/test/IceUtil/stacktrace/test.py b/cpp/test/IceUtil/stacktrace/test.py
index 8ce24faa058..3ce21186bc9 100644
--- a/cpp/test/IceUtil/stacktrace/test.py
+++ b/cpp/test/IceUtil/stacktrace/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__name__, options = { "cpp11" : [False] })
diff --git a/cpp/test/IceUtil/thread/AliveTest.cpp b/cpp/test/IceUtil/thread/AliveTest.cpp
index af8c7e8d206..24e6cf35c80 100644
--- a/cpp/test/IceUtil/thread/AliveTest.cpp
+++ b/cpp/test/IceUtil/thread/AliveTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/AliveTest.h b/cpp/test/IceUtil/thread/AliveTest.h
index aee86d418fb..8d40e8b3374 100644
--- a/cpp/test/IceUtil/thread/AliveTest.h
+++ b/cpp/test/IceUtil/thread/AliveTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef ALIVE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp
index ed4dc848fe1..8146a7af76b 100644
--- a/cpp/test/IceUtil/thread/Client.cpp
+++ b/cpp/test/IceUtil/thread/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
index 890d898cc17..6e4c3935507 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.h b/cpp/test/IceUtil/thread/CountDownLatchTest.h
index acc78f5d9ca..333d10a7715 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.h
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef COUNT_DOWN_LATCH_TEST_H
diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp
index c02753022a2..3c4d7541ac6 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h
index c2766e8ae05..86c541302cd 100644
--- a/cpp/test/IceUtil/thread/CreateTest.h
+++ b/cpp/test/IceUtil/thread/CreateTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef CREATE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Makefile.mk b/cpp/test/IceUtil/thread/Makefile.mk
index 2e30073420a..76a975ceb4b 100644
--- a/cpp/test/IceUtil/thread/Makefile.mk
+++ b/cpp/test/IceUtil/thread/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 562b5ce3462..48f7610d3d6 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h
index d32fd30db23..b138da6e0a8 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef MONITOR_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
index 43aed0ac945..23e6594d468 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
index 7d4aa6bffb2..5ae3f6b2f07 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef MONITOR_REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index 7c941774ad1..47678184553 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h
index e83a9a20745..9892b368d22 100644
--- a/cpp/test/IceUtil/thread/MutexTest.h
+++ b/cpp/test/IceUtil/thread/MutexTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index d601d6ec0f5..ca3a1ab2b3b 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h
index 88056ae541d..721f42372ab 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RecMutexTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/SleepTest.cpp b/cpp/test/IceUtil/thread/SleepTest.cpp
index 56315745e99..536d0c08594 100644
--- a/cpp/test/IceUtil/thread/SleepTest.cpp
+++ b/cpp/test/IceUtil/thread/SleepTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/SleepTest.h b/cpp/test/IceUtil/thread/SleepTest.h
index 5e3fda6fb19..20fbac9a7b8 100644
--- a/cpp/test/IceUtil/thread/SleepTest.h
+++ b/cpp/test/IceUtil/thread/SleepTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef SLEEP_TEST_H
diff --git a/cpp/test/IceUtil/thread/StartTest.cpp b/cpp/test/IceUtil/thread/StartTest.cpp
index 989a4b56c68..45fc05828d3 100644
--- a/cpp/test/IceUtil/thread/StartTest.cpp
+++ b/cpp/test/IceUtil/thread/StartTest.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/StartTest.h b/cpp/test/IceUtil/thread/StartTest.h
index 190b4db666d..59e467546a6 100644
--- a/cpp/test/IceUtil/thread/StartTest.h
+++ b/cpp/test/IceUtil/thread/StartTest.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef START_TEST_H
diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp
index e4373754100..3d6da074efb 100644
--- a/cpp/test/IceUtil/thread/TestBase.cpp
+++ b/cpp/test/IceUtil/thread/TestBase.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index b72d62b1493..63bae0e33f8 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_BASE_H
diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index 0a37c0faa87..ab601606fea 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <TestBase.h>
diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h
index 2d8d52cad06..4099bb006f4 100644
--- a/cpp/test/IceUtil/thread/TestSuite.h
+++ b/cpp/test/IceUtil/thread/TestSuite.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_SUITE_H
diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp
index 929f77e5ac9..ddc0ae8b0e3 100644
--- a/cpp/test/IceUtil/timer/Client.cpp
+++ b/cpp/test/IceUtil/timer/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/Timer.h>
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index 8887558d828..b5ac45976ed 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/IceUtil.h>
diff --git a/cpp/test/IceUtil/unicode/test.py b/cpp/test/IceUtil/unicode/test.py
index a9609d0ec7f..781433d8f28 100644
--- a/cpp/test/IceUtil/unicode/test.py
+++ b/cpp/test/IceUtil/unicode/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
TestSuite(__name__, [ ClientTestCase(client=SimpleClient(args=["{testdir}"])) ])
diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index 95690fc246b..636a3580d3c 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <IceUtil/UUID.h>
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index f63a282aa4e..ae92d7f2a4d 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index f71fe583a07..8b870700d06 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
index b466eaee449..9647c1b1ee3 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index cb4b12c2ba7..fa54a4d48ef 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
index 809e4edc395..5bbfae899eb 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
index 10ff8036dbc..f0d66c0d427 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index 1bf714b0e12..eec1c229a10 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index 0a8d253d51b..b2d6a7d85f2 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
index 2f1faca6655..899bfbc46c7 100644
--- a/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
+++ b/cpp/test/Slice/errorDetection/DummyAtGlobalLevel.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
interface Foo
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
index 772ab3f1b7d..a227d2389e7 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
index 32bb2bb22cf..a5d4a700ec3 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice
index cb73ac5d21e..590a088cd05 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.ice
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
index 2ad0c649a45..5e541df72e4 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
index ec992c18d3a..2d9254ca7f6 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorDuplication.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
index 20177d2ffd6..41b0c6f6f9f 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/EnumeratorValues.ice b/cpp/test/Slice/errorDetection/EnumeratorValues.ice
index 1594aeaf71b..7e5e91abe98 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorValues.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorValues.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
index eea41e8c797..c4a5ca1c8eb 100644
--- a/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ExceptionRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index 874fbc88a9f..bcd22177907 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
index 93a59ad05ef..c7ec8f7bfe5 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
index d97ee300c30..f9dff23f605 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index 963b89f287b..b539022bcd0 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
index 0f9b137aad9..7eebd6fbbd7 100644
--- a/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
+++ b/cpp/test/Slice/errorDetection/IllegalIdentifier.ice
@@ -6,9 +6,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index 5d238421819..54166810c41 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index 9e36777b607..bc9e3aff0d1 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
index a9d16a32070..f9562bbcbce 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
index 4de38fde84a..b32c7d74d8c 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
index ae5ea400780..0e7220fd89b 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice
index a3cb2d0f479..6ef3357f6fd 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.ice
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
index 9796b33ef1b..894ffff08aa 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
index bfbdfd9f1fc..6cdf7d25ada 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice
index 4c84df6d345..8e9675757cb 100644
--- a/cpp/test/Slice/errorDetection/NotException.ice
+++ b/cpp/test/Slice/errorDetection/NotException.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice
index fa955b0155f..fd5485063b0 100644
--- a/cpp/test/Slice/errorDetection/NotType.ice
+++ b/cpp/test/Slice/errorDetection/NotType.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
index e3dc1c71ea8..ebc88ac7124 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/OptionalMembers.ice b/cpp/test/Slice/errorDetection/OptionalMembers.ice
index bc5887cf07d..e0f9e2fbd9f 100644
--- a/cpp/test/Slice/errorDetection/OptionalMembers.ice
+++ b/cpp/test/Slice/errorDetection/OptionalMembers.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/OptionalParams.ice b/cpp/test/Slice/errorDetection/OptionalParams.ice
index 2df2642a24d..73d167930ac 100644
--- a/cpp/test/Slice/errorDetection/OptionalParams.ice
+++ b/cpp/test/Slice/errorDetection/OptionalParams.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
index 68fc51793c7..b40ed9bacbd 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
index 26d4fbf6f8e..a205b5f8d40 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
index 387d0660c32..5aa00011df1 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:deprecated"]] // for classes with operations
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
index 72c95613311..f500aeb5677 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
index 2c1f3a69d66..3defdba921f 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
index b81c0ac0f2e..06e3077347b 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
index 4b48bbb8735..a76a5a407f8 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
index 333559fd7d4..fb3216c0dc9 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
index 231332d147a..c18dbe3b1d4 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index cb0ccd59191..3a75ea6d8de 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index a5bbadfc828..5168ad8e99d 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
index 55c0b1432ae..6d31ca705ec 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index b42b3286dca..d2798990d92 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/StructRedefinition.ice b/cpp/test/Slice/errorDetection/StructRedefinition.ice
index df5be0f2dcc..df546245f97 100644
--- a/cpp/test/Slice/errorDetection/StructRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/StructRedefinition.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice
index d6409694174..e3156dbf130 100644
--- a/cpp/test/Slice/errorDetection/Undefined.ice
+++ b/cpp/test/Slice/errorDetection/Undefined.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/WarningClassProxy.ice b/cpp/test/Slice/errorDetection/WarningClassProxy.ice
index abf27f44a96..027f465ed78 100644
--- a/cpp/test/Slice/errorDetection/WarningClassProxy.ice
+++ b/cpp/test/Slice/errorDetection/WarningClassProxy.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
index 8a558b9ca4e..14ccc27444c 100644
--- a/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
+++ b/cpp/test/Slice/errorDetection/WarningInterfaceByValue.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module Test
diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
index 4bcb38ca463..1d590354750 100644
--- a/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
+++ b/cpp/test/Slice/errorDetection/WarningInvalidMetaData.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["cpp:header-ext:hh"]]
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
index 7cc5bf61983..d5301b6812a 100644
--- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
+++ b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetaData.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["suppress-warning:invalid-metadata"]]
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice
index 5cb863aeac4..7338ee70247 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.ice
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
index 2d7b75ccfc0..7fac95e93e3 100644
--- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice
+++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
module IceSomething {}
diff --git a/cpp/test/Slice/errorDetection/test.py b/cpp/test/Slice/errorDetection/test.py
index cfbda8fa169..40938b9d408 100644
--- a/cpp/test/Slice/errorDetection/test.py
+++ b/cpp/test/Slice/errorDetection/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import glob
diff --git a/cpp/test/Slice/escape/Clash.ice b/cpp/test/Slice/escape/Clash.ice
index 71dd5655351..4e62034ca18 100644
--- a/cpp/test/Slice/escape/Clash.ice
+++ b/cpp/test/Slice/escape/Clash.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["underscore"]]
diff --git a/cpp/test/Slice/escape/Client.cpp b/cpp/test/Slice/escape/Client.cpp
index 7424989ec1a..17b90191266 100644
--- a/cpp/test/Slice/escape/Client.cpp
+++ b/cpp/test/Slice/escape/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice
index e61d1541a09..1744070583e 100644
--- a/cpp/test/Slice/escape/Key.ice
+++ b/cpp/test/Slice/escape/Key.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["underscore"]]
diff --git a/cpp/test/Slice/escape/Makefile.mk b/cpp/test/Slice/escape/Makefile.mk
index efe311f67d6..257e15b02be 100644
--- a/cpp/test/Slice/escape/Makefile.mk
+++ b/cpp/test/Slice/escape/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(test)_client_sources = Client.cpp Clash.ice Key.ice
diff --git a/cpp/test/Slice/headers/test.py b/cpp/test/Slice/headers/test.py
index 2e6135d5120..de6bd1a905a 100644
--- a/cpp/test/Slice/headers/test.py
+++ b/cpp/test/Slice/headers/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import glob
diff --git a/cpp/test/Slice/macros/Client.cpp b/cpp/test/Slice/macros/Client.cpp
index e58987f176e..f5071a11f22 100644
--- a/cpp/test/Slice/macros/Client.cpp
+++ b/cpp/test/Slice/macros/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Slice/macros/Test.ice b/cpp/test/Slice/macros/Test.ice
index 793e52d2b9c..25636dece2d 100644
--- a/cpp/test/Slice/macros/Test.ice
+++ b/cpp/test/Slice/macros/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
//
diff --git a/cpp/test/Slice/parser/CircularA.ice b/cpp/test/Slice/parser/CircularA.ice
index b556acfcc02..7b85eedbc12 100644
--- a/cpp/test/Slice/parser/CircularA.ice
+++ b/cpp/test/Slice/parser/CircularA.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Slice/parser/CircularB.ice b/cpp/test/Slice/parser/CircularB.ice
index fcf745b4506..e155e584e69 100644
--- a/cpp/test/Slice/parser/CircularB.ice
+++ b/cpp/test/Slice/parser/CircularB.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp
index 246043e239e..ccdada87e5e 100644
--- a/cpp/test/Slice/structure/Client.cpp
+++ b/cpp/test/Slice/structure/Client.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include <Ice/Ice.h>
diff --git a/cpp/test/Slice/structure/Test.ice b/cpp/test/Slice/structure/Test.ice
index 2f547c3e99d..c54b243f6f6 100644
--- a/cpp/test/Slice/structure/Test.ice
+++ b/cpp/test/Slice/structure/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
[["cpp:include:list"]]
diff --git a/cpp/test/Slice/unicodePaths/test.py b/cpp/test/Slice/unicodePaths/test.py
index 9c30ab66021..18692397c4e 100644
--- a/cpp/test/Slice/unicodePaths/test.py
+++ b/cpp/test/Slice/unicodePaths/test.py
@@ -3,9 +3,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
import shutil, locale
diff --git a/cpp/test/Slice/utf8BOM/Test.ice b/cpp/test/Slice/utf8BOM/Test.ice
index 0d8b6e89fe3..f9fcc584aa1 100644
--- a/cpp/test/Slice/utf8BOM/Test.ice
+++ b/cpp/test/Slice/utf8BOM/Test.ice
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/include/TestHelper.h b/cpp/test/include/TestHelper.h
index e8d6c0216e4..be7bcba6308 100644
--- a/cpp/test/include/TestHelper.h
+++ b/cpp/test/include/TestHelper.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#ifndef TEST_HELPER_H
diff --git a/cpp/test/ios/controller/Bundle/ControllerI.mm b/cpp/test/ios/controller/Bundle/ControllerI.mm
index dcd6fbbed83..cc250afce2a 100644
--- a/cpp/test/ios/controller/Bundle/ControllerI.mm
+++ b/cpp/test/ios/controller/Bundle/ControllerI.mm
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import <Foundation/Foundation.h>
diff --git a/cpp/test/ios/controller/Classes/AppDelegate.h b/cpp/test/ios/controller/Classes/AppDelegate.h
index a1b4a6020d4..316bcf5e70b 100644
--- a/cpp/test/ios/controller/Classes/AppDelegate.h
+++ b/cpp/test/ios/controller/Classes/AppDelegate.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/cpp/test/ios/controller/Classes/AppDelegate.m b/cpp/test/ios/controller/Classes/AppDelegate.m
index 72fd1624111..c6d714b9ed7 100644
--- a/cpp/test/ios/controller/Classes/AppDelegate.m
+++ b/cpp/test/ios/controller/Classes/AppDelegate.m
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import "AppDelegate.h"
diff --git a/cpp/test/ios/controller/Classes/ControllerView.h b/cpp/test/ios/controller/Classes/ControllerView.h
index 9204d3dda62..20d5761bcda 100644
--- a/cpp/test/ios/controller/Classes/ControllerView.h
+++ b/cpp/test/ios/controller/Classes/ControllerView.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/cpp/test/ios/controller/Classes/ControllerView.m b/cpp/test/ios/controller/Classes/ControllerView.m
index df898efd24a..c16f5a9b20e 100644
--- a/cpp/test/ios/controller/Classes/ControllerView.m
+++ b/cpp/test/ios/controller/Classes/ControllerView.m
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import "ControllerView.h"
diff --git a/cpp/test/ios/controller/Classes/main.m b/cpp/test/ios/controller/Classes/main.m
index d84a6576b9d..38ed9425fcc 100644
--- a/cpp/test/ios/controller/Classes/main.m
+++ b/cpp/test/ios/controller/Classes/main.m
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/cpp/test/ios/controller/Makefile.mk b/cpp/test/ios/controller/Makefile.mk
index eac3b69a45e..c44d6f9fecd 100644
--- a/cpp/test/ios/controller/Makefile.mk
+++ b/cpp/test/ios/controller/Makefile.mk
@@ -2,9 +2,6 @@
#
# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
# **********************************************************************
$(project)_type = xcode
diff --git a/cpp/test/uwp/controller/App.xaml.cpp b/cpp/test/uwp/controller/App.xaml.cpp
index c5ec46dd84c..f06d160c7b3 100644
--- a/cpp/test/uwp/controller/App.xaml.cpp
+++ b/cpp/test/uwp/controller/App.xaml.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "pch.h"
diff --git a/cpp/test/uwp/controller/App.xaml.h b/cpp/test/uwp/controller/App.xaml.h
index 628f7b88277..148e6fbbba7 100644
--- a/cpp/test/uwp/controller/App.xaml.h
+++ b/cpp/test/uwp/controller/App.xaml.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once
diff --git a/cpp/test/uwp/controller/ControllerView.xaml.cpp b/cpp/test/uwp/controller/ControllerView.xaml.cpp
index 03e26211c33..6d8951d7b1b 100644
--- a/cpp/test/uwp/controller/ControllerView.xaml.cpp
+++ b/cpp/test/uwp/controller/ControllerView.xaml.cpp
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#include "ControllerView.xaml.h"
diff --git a/cpp/test/uwp/controller/ControllerView.xaml.h b/cpp/test/uwp/controller/ControllerView.xaml.h
index 3cdb50d2e96..f8db9f6f358 100644
--- a/cpp/test/uwp/controller/ControllerView.xaml.h
+++ b/cpp/test/uwp/controller/ControllerView.xaml.h
@@ -2,9 +2,6 @@
//
// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
// **********************************************************************
#pragma once