summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2004-05-18 03:15:02 +0000
committerBernard Normier <bernard@zeroc.com>2004-05-18 03:15:02 +0000
commitebe2d4dca31883e8d539654590f19c142ddd20ed (patch)
tree41d3d309c42a761826e674537332fc5c0cf8be40 /cpp/include
parentUpdated Windows installer for Ice 1.4.0 (diff)
downloadice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.bz2
ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.tar.xz
ice-ebe2d4dca31883e8d539654590f19c142ddd20ed.zip
Fixed copyright
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/Freeze/Freeze.h7
-rw-r--r--cpp/include/Freeze/Index.h7
-rw-r--r--cpp/include/Freeze/Initialize.h7
-rw-r--r--cpp/include/Freeze/Makefile7
-rw-r--r--cpp/include/Freeze/Map.h7
-rw-r--r--cpp/include/Freeze/TransactionHolder.h7
-rw-r--r--cpp/include/Glacier/Glacier.h7
-rw-r--r--cpp/include/Glacier/Makefile7
-rw-r--r--cpp/include/Ice/Application.h7
-rw-r--r--cpp/include/Ice/BasicStream.h7
-rw-r--r--cpp/include/Ice/Buffer.h7
-rw-r--r--cpp/include/Ice/Config.h7
-rw-r--r--cpp/include/Ice/ConnectionF.h7
-rw-r--r--cpp/include/Ice/ConnectionFactoryF.h7
-rw-r--r--cpp/include/Ice/ConnectionMonitorF.h7
-rw-r--r--cpp/include/Ice/Direct.h7
-rw-r--r--cpp/include/Ice/DynamicLibrary.h7
-rw-r--r--cpp/include/Ice/DynamicLibraryF.h7
-rw-r--r--cpp/include/Ice/EndpointF.h7
-rw-r--r--cpp/include/Ice/EndpointFactory.h7
-rw-r--r--cpp/include/Ice/EndpointFactoryF.h7
-rw-r--r--cpp/include/Ice/Exception.h7
-rw-r--r--cpp/include/Ice/FactoryTable.h7
-rw-r--r--cpp/include/Ice/FactoryTableDef.h7
-rw-r--r--cpp/include/Ice/Functional.h7
-rw-r--r--cpp/include/Ice/Handle.h7
-rw-r--r--cpp/include/Ice/Ice.h7
-rw-r--r--cpp/include/Ice/IdentityUtil.h7
-rw-r--r--cpp/include/Ice/Incoming.h7
-rw-r--r--cpp/include/Ice/IncomingAsync.h7
-rw-r--r--cpp/include/Ice/IncomingAsyncF.h7
-rw-r--r--cpp/include/Ice/Initialize.h7
-rw-r--r--cpp/include/Ice/InstanceF.h7
-rw-r--r--cpp/include/Ice/LocalObject.h7
-rw-r--r--cpp/include/Ice/LocalObjectF.h7
-rw-r--r--cpp/include/Ice/LoggerUtil.h7
-rw-r--r--cpp/include/Ice/Makefile7
-rw-r--r--cpp/include/Ice/Object.h7
-rw-r--r--cpp/include/Ice/ObjectAdapterFactoryF.h7
-rw-r--r--cpp/include/Ice/ObjectF.h7
-rw-r--r--cpp/include/Ice/Outgoing.h7
-rw-r--r--cpp/include/Ice/OutgoingAsync.h7
-rw-r--r--cpp/include/Ice/OutgoingAsyncF.h7
-rw-r--r--cpp/include/Ice/ProtocolPluginFacade.h7
-rw-r--r--cpp/include/Ice/ProtocolPluginFacadeF.h7
-rw-r--r--cpp/include/Ice/Proxy.h7
-rw-r--r--cpp/include/Ice/ProxyF.h7
-rw-r--r--cpp/include/Ice/ProxyFactoryF.h7
-rw-r--r--cpp/include/Ice/ProxyHandle.h7
-rw-r--r--cpp/include/Ice/ReferenceF.h7
-rw-r--r--cpp/include/Ice/RoutingTable.h7
-rw-r--r--cpp/include/Ice/RoutingTableF.h7
-rw-r--r--cpp/include/Ice/ServantManagerF.h7
-rwxr-xr-xcpp/include/Ice/Service.h6
-rw-r--r--cpp/include/Ice/UserExceptionFactory.h7
-rw-r--r--cpp/include/Ice/UserExceptionFactoryF.h7
-rw-r--r--cpp/include/IceBox/Makefile7
-rw-r--r--cpp/include/IcePack/Makefile7
-rw-r--r--cpp/include/IcePatch/ClientUtil.h7
-rw-r--r--cpp/include/IcePatch/FileDescFactory.h7
-rw-r--r--cpp/include/IcePatch/Makefile7
-rw-r--r--cpp/include/IcePatch/Util.h7
-rw-r--r--cpp/include/IceSSL/CertificateVerifierOpenSSL.h7
-rw-r--r--cpp/include/IceSSL/Config.h7
-rw-r--r--cpp/include/IceSSL/Makefile7
-rw-r--r--cpp/include/IceSSL/RSACertificateGen.h7
-rw-r--r--cpp/include/IceSSL/RSACertificateGenF.h7
-rw-r--r--cpp/include/IceSSL/RSAKeyPair.h7
-rw-r--r--cpp/include/IceSSL/RSAKeyPairF.h7
-rw-r--r--cpp/include/IceSSL/RSAPrivateKey.h7
-rw-r--r--cpp/include/IceSSL/RSAPrivateKeyF.h7
-rw-r--r--cpp/include/IceSSL/RSAPublicKey.h7
-rw-r--r--cpp/include/IceSSL/RSAPublicKeyF.h7
-rw-r--r--cpp/include/IceStorm/Makefile7
-rw-r--r--cpp/include/IceUtil/AbstractMutex.h7
-rw-r--r--cpp/include/IceUtil/Algorithm.h7
-rw-r--r--cpp/include/IceUtil/Base64.h7
-rw-r--r--cpp/include/IceUtil/Cache.h7
-rw-r--r--cpp/include/IceUtil/Cond.h7
-rw-r--r--cpp/include/IceUtil/Config.h7
-rw-r--r--cpp/include/IceUtil/CountDownLatch.h7
-rw-r--r--cpp/include/IceUtil/CtrlCHandler.h7
-rw-r--r--cpp/include/IceUtil/Exception.h7
-rw-r--r--cpp/include/IceUtil/Functional.h7
-rw-r--r--cpp/include/IceUtil/GC.h7
-rw-r--r--cpp/include/IceUtil/GCRecMutex.h7
-rw-r--r--cpp/include/IceUtil/GCShared.h7
-rw-r--r--cpp/include/IceUtil/Handle.h7
-rw-r--r--cpp/include/IceUtil/IceUtil.h7
-rw-r--r--cpp/include/IceUtil/InputUtil.h7
-rw-r--r--cpp/include/IceUtil/Iterator.h7
-rw-r--r--cpp/include/IceUtil/Lock.h7
-rw-r--r--cpp/include/IceUtil/Makefile7
-rw-r--r--cpp/include/IceUtil/Monitor.h7
-rw-r--r--cpp/include/IceUtil/Mutex.h7
-rw-r--r--cpp/include/IceUtil/OutputUtil.h7
-rw-r--r--cpp/include/IceUtil/RWRecMutex.h7
-rw-r--r--cpp/include/IceUtil/RecMutex.h7
-rw-r--r--cpp/include/IceUtil/Shared.h7
-rw-r--r--cpp/include/IceUtil/StaticMutex.h7
-rw-r--r--cpp/include/IceUtil/StringUtil.h7
-rw-r--r--cpp/include/IceUtil/Thread.h7
-rw-r--r--cpp/include/IceUtil/ThreadException.h7
-rw-r--r--cpp/include/IceUtil/Time.h7
-rw-r--r--cpp/include/IceUtil/UUID.h7
-rw-r--r--cpp/include/IceUtil/Unicode.h7
-rw-r--r--cpp/include/IceXML/Makefile7
-rw-r--r--cpp/include/IceXML/Parser.h7
-rw-r--r--cpp/include/Makefile7
-rw-r--r--cpp/include/Slice/CPlusPlusUtil.h7
-rw-r--r--cpp/include/Slice/CsUtil.h7
-rw-r--r--cpp/include/Slice/JavaUtil.h7
-rw-r--r--cpp/include/Slice/Makefile7
-rw-r--r--cpp/include/Slice/Parser.h7
-rw-r--r--cpp/include/Slice/Preprocessor.h7
115 files changed, 115 insertions, 689 deletions
diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index 7c141d5269a..3bcf5677457 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef FREEZE_FREEZE_H
#define FREEZE_FREEZE_H
diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h
index c8c40478c4b..f26fec73751 100644
--- a/cpp/include/Freeze/Index.h
+++ b/cpp/include/Freeze/Index.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef FREEZE_INDEX_H
#define FREEZE_INDEX_H
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h
index 507c1f5d22d..b09f0bca7ea 100644
--- a/cpp/include/Freeze/Initialize.h
+++ b/cpp/include/Freeze/Initialize.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef FREEZE_INITIALIZE_H
#define FREEZE_INITIALIZE_H
diff --git a/cpp/include/Freeze/Makefile b/cpp/include/Freeze/Makefile
index cf5a4660cb3..1e603262e97 100644
--- a/cpp/include/Freeze/Makefile
+++ b/cpp/include/Freeze/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h
index ce1648bb7d5..e4b06220647 100644
--- a/cpp/include/Freeze/Map.h
+++ b/cpp/include/Freeze/Map.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef FREEZE_MAP_H
#define FREEZE_MAP_H
diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h
index 0b3ffab9d97..55815aca32e 100644
--- a/cpp/include/Freeze/TransactionHolder.h
+++ b/cpp/include/Freeze/TransactionHolder.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef FREEZE_TRANSACTION_HOLDER_H
#define FREEZE_TRANSACTION_HOLDER_H
diff --git a/cpp/include/Glacier/Glacier.h b/cpp/include/Glacier/Glacier.h
index 5b452fa85b5..c7a31d33d47 100644
--- a/cpp/include/Glacier/Glacier.h
+++ b/cpp/include/Glacier/Glacier.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef GLACIER_H
#define GLACIER_H
diff --git a/cpp/include/Glacier/Makefile b/cpp/include/Glacier/Makefile
index 24ced4bd046..2c30a270ced 100644
--- a/cpp/include/Glacier/Makefile
+++ b/cpp/include/Glacier/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 43dbdbfa10d..708a2097176 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_APPLICATION_H
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index daf67c15080..21e67018d14 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_H
#define ICE_STREAM_H
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 90868430396..64beb18dc56 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_BUFFER_H
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 9fc932b9595..145d34ff4ca 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_CONFIG_H
diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
index a7bb0d2d582..94a385c8dc9 100644
--- a/cpp/include/Ice/ConnectionF.h
+++ b/cpp/include/Ice/ConnectionF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_F_H
#define ICE_CONNECTION_F_H
diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h
index c9aba0a2d4b..c6951439a87 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_CONNECTION_FACTORY_F_H
diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h
index f28b574d09a..081de20fb80 100644
--- a/cpp/include/Ice/ConnectionMonitorF.h
+++ b/cpp/include/Ice/ConnectionMonitorF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_MONITOR_F_H
#define ICE_CONNECTION_MONITOR_F_H
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h
index 77129ba70bc..9d58f39fc64 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_DIRECT_H
#define ICE_DIRECT_H
diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h
index 688d8b9b628..8fa83c825ab 100644
--- a/cpp/include/Ice/DynamicLibrary.h
+++ b/cpp/include/Ice/DynamicLibrary.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_DYNAMIC_LIBRARY_H
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index da173c8a561..1b97e02359a 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_DYNAMIC_LIBRARY_F_H
diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
index 63f6c1277e3..1b594d0dd7e 100644
--- a/cpp/include/Ice/EndpointF.h
+++ b/cpp/include/Ice/EndpointF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_F_H
#define ICE_ENDPOINT_F_H
diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h
index a53bea7c494..145ef7b66e7 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_ENDPOINT_FACTORY_H
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index 020bee6e1bc..12f023d4457 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_ENDPOINT_FACTORY_F_H
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 0fe6d9eddae..54f0986f627 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_EXCEPTION_H
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index cbb4eb5ebad..38261ecd909 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_FACTORYTABLE_H
diff --git a/cpp/include/Ice/FactoryTableDef.h b/cpp/include/Ice/FactoryTableDef.h
index 637360bbaaf..68287a10237 100644
--- a/cpp/include/Ice/FactoryTableDef.h
+++ b/cpp/include/Ice/FactoryTableDef.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_FACTORY_TABLE_DEF_H
#define ICE_FACTORY_TABLE_DEF_H
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 7f1045e8813..44195e713fb 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_FUNCTIONAL_H
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index c5fe59fe274..06557433e69 100644
--- a/cpp/include/Ice/Handle.h
+++ b/cpp/include/Ice/Handle.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_HANDLE_H
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 490c3ce70b1..5ec4eff9b2d 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_ICE_H
diff --git a/cpp/include/Ice/IdentityUtil.h b/cpp/include/Ice/IdentityUtil.h
index ed864a33a05..8b3e020e1cc 100644
--- a/cpp/include/Ice/IdentityUtil.h
+++ b/cpp/include/Ice/IdentityUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_IDENTITY_UTIL_H
#define ICE_IDENTITY_UTIL_H
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index ca95657b322..ae70cf8b59f 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_INCOMING_H
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index b8dafb78df5..5cae46dc755 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_INCOMING_ASYNC_H
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 3a99af6d766..ca50eb95d5c 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_INCOMING_ASYNC_F_H
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 16900008983..0caf117d466 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_INITIALIZE_H
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 73cae1355a9..2d22882716e 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_INSTANCE_F_H
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 4b16fddf1bf..ff1ecd6f765 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_LOCAL_OBJECT_H
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 709b0ae678b..bd40df4bf38 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_LOCAL_OBJECT_F_H
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index ceb7daf3806..5b22e84ad70 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_LOGGER_UTIL_H
diff --git a/cpp/include/Ice/Makefile b/cpp/include/Ice/Makefile
index 4876331d855..60cb8ec36bc 100644
--- a/cpp/include/Ice/Makefile
+++ b/cpp/include/Ice/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index df362df30eb..3c57125651b 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_OBJECT_H
diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h
index d357db8aa83..adc2c124b7b 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_OBJECT_ADAPTER_FACTORY_F_H
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index 0d1963a04b3..e982d0721b6 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_OBJECT_F_H
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index d3db45835f7..8d91bfaacf7 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_H
#define ICE_OUTGOING_H
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 4ccda2d7542..1cc4673a422 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_OUTGOING_ASYNC_H
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index b2ba3eddb47..a884dd83f29 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_OUTGOING_ASYNC_F_H
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index ac720c15cf3..64b1e117325 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROTOCOL_PLUGIN_FACADE_H
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index 0e4cfefdcc3..bb553ea6efa 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROTOCOL_PLUGIN_FACADE_F_H
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index e54e973f5e1..8044b601993 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROXY_H
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 00c75233303..3550e730d6d 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROXY_F_H
diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h
index 0a8c57fcfee..c2095d9a5c5 100644
--- a/cpp/include/Ice/ProxyFactoryF.h
+++ b/cpp/include/Ice/ProxyFactoryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROXY_FACTORY_F_H
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 1a63e7df34d..19de7533587 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_PROXY_HANDLE_H
diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h
index 81a8435e3d8..c26a9632070 100644
--- a/cpp/include/Ice/ReferenceF.h
+++ b/cpp/include/Ice/ReferenceF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_REFERENCE_F_H
diff --git a/cpp/include/Ice/RoutingTable.h b/cpp/include/Ice/RoutingTable.h
index b215f7ef2d3..d440cdf9803 100644
--- a/cpp/include/Ice/RoutingTable.h
+++ b/cpp/include/Ice/RoutingTable.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_ROUTING_TABLE_H
diff --git a/cpp/include/Ice/RoutingTableF.h b/cpp/include/Ice/RoutingTableF.h
index 56a34f22f68..bd51cdb24b1 100644
--- a/cpp/include/Ice/RoutingTableF.h
+++ b/cpp/include/Ice/RoutingTableF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_F_H
#define ICE_ROUTING_TABLE_F_H
diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h
index fc6d00f4a52..422c06e07cf 100644
--- a/cpp/include/Ice/ServantManagerF.h
+++ b/cpp/include/Ice/ServantManagerF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_SERVANT_MANAGER_F_H
diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h
index 7d5534a9af5..49ebe31bfd0 100755
--- a/cpp/include/Ice/Service.h
+++ b/cpp/include/Ice/Service.h
@@ -1,10 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. 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/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h
index aaea6efe465..d7cf11a80ec 100644
--- a/cpp/include/Ice/UserExceptionFactory.h
+++ b/cpp/include/Ice/UserExceptionFactory.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_USER_EXCEPTION_FACTORY_H
diff --git a/cpp/include/Ice/UserExceptionFactoryF.h b/cpp/include/Ice/UserExceptionFactoryF.h
index a1fc7ce4f98..8f3bc147142 100644
--- a/cpp/include/Ice/UserExceptionFactoryF.h
+++ b/cpp/include/Ice/UserExceptionFactoryF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_FACTORYF_H
#define ICE_USER_EXCEPTION_FACTORYF_H
diff --git a/cpp/include/IceBox/Makefile b/cpp/include/IceBox/Makefile
index 722f0358137..995be1d7807 100644
--- a/cpp/include/IceBox/Makefile
+++ b/cpp/include/IceBox/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePack/Makefile b/cpp/include/IcePack/Makefile
index d5e2d7cb01f..12fc8bac778 100644
--- a/cpp/include/IcePack/Makefile
+++ b/cpp/include/IcePack/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePatch/ClientUtil.h b/cpp/include/IcePatch/ClientUtil.h
index 79450082b1a..8dcc116b5d4 100644
--- a/cpp/include/IcePatch/ClientUtil.h
+++ b/cpp/include/IcePatch/ClientUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_PATCH_CLIENT_UTIL_H
#define ICE_PATCH_CLIENT_UTIL_H
diff --git a/cpp/include/IcePatch/FileDescFactory.h b/cpp/include/IcePatch/FileDescFactory.h
index 147f4220a21..ad1acb30a98 100644
--- a/cpp/include/IcePatch/FileDescFactory.h
+++ b/cpp/include/IcePatch/FileDescFactory.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_PATCH_FILE_DESC_FACTORY_H
#define ICE_PATCH_FILE_DESC_FACTORY_H
diff --git a/cpp/include/IcePatch/Makefile b/cpp/include/IcePatch/Makefile
index 7375a0c7d22..788ffb8afe7 100644
--- a/cpp/include/IcePatch/Makefile
+++ b/cpp/include/IcePatch/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IcePatch/Util.h b/cpp/include/IcePatch/Util.h
index e2b8901b49e..8a6d4811144 100644
--- a/cpp/include/IcePatch/Util.h
+++ b/cpp/include/IcePatch/Util.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_PATCH_UTIL_H
#define ICE_PATCH_UTIL_H
diff --git a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
index a34efc84263..218d26e893d 100644
--- a/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
+++ b/cpp/include/IceSSL/CertificateVerifierOpenSSL.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H
#define ICE_SSL_CERTIFICATE_VERIFIER_OPENSSL_H
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 4fd6570f6ad..9612928a099 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -1,10 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
@@ -12,7 +8,6 @@
// **********************************************************************
-
#ifndef ICE_SSL_CONFIG_H
#define ICE_SSL_CONFIG_H
diff --git a/cpp/include/IceSSL/Makefile b/cpp/include/IceSSL/Makefile
index 2f52c9efd86..60e1c2ad7e3 100644
--- a/cpp/include/IceSSL/Makefile
+++ b/cpp/include/IceSSL/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceSSL/RSACertificateGen.h b/cpp/include/IceSSL/RSACertificateGen.h
index b63b5a97a7f..1a381302f4e 100644
--- a/cpp/include/IceSSL/RSACertificateGen.h
+++ b/cpp/include/IceSSL/RSACertificateGen.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_CERTIFICATE_GEN_H
#define ICE_SSL_CERTIFICATE_GEN_H
diff --git a/cpp/include/IceSSL/RSACertificateGenF.h b/cpp/include/IceSSL/RSACertificateGenF.h
index cea7263294c..ae202d85f2a 100644
--- a/cpp/include/IceSSL/RSACertificateGenF.h
+++ b/cpp/include/IceSSL/RSACertificateGenF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_CERTIFICATE_GEN_F_H
#define ICE_SSL_CERTIFICATE_GEN_F_H
diff --git a/cpp/include/IceSSL/RSAKeyPair.h b/cpp/include/IceSSL/RSAKeyPair.h
index 70cbe7d4665..cdf11573404 100644
--- a/cpp/include/IceSSL/RSAKeyPair.h
+++ b/cpp/include/IceSSL/RSAKeyPair.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_KEY_PAIR_H
#define ICE_SSL_RSA_KEY_PAIR_H
diff --git a/cpp/include/IceSSL/RSAKeyPairF.h b/cpp/include/IceSSL/RSAKeyPairF.h
index fbd12b460b7..245f0f68c0a 100644
--- a/cpp/include/IceSSL/RSAKeyPairF.h
+++ b/cpp/include/IceSSL/RSAKeyPairF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_KEY_PAIR_F_H
#define ICE_SSL_RSA_KEY_PAIR_F_H
diff --git a/cpp/include/IceSSL/RSAPrivateKey.h b/cpp/include/IceSSL/RSAPrivateKey.h
index ffed8dc02e4..03c8cae0428 100644
--- a/cpp/include/IceSSL/RSAPrivateKey.h
+++ b/cpp/include/IceSSL/RSAPrivateKey.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_PRIVATE_KEY_H
#define ICE_SSL_RSA_PRIVATE_KEY_H
diff --git a/cpp/include/IceSSL/RSAPrivateKeyF.h b/cpp/include/IceSSL/RSAPrivateKeyF.h
index 14eac8adb4f..e2e49c1dd40 100644
--- a/cpp/include/IceSSL/RSAPrivateKeyF.h
+++ b/cpp/include/IceSSL/RSAPrivateKeyF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_PRIVATE_KEY_F_H
#define ICE_SSL_RSA_PRIVATE_KEY_F_H
diff --git a/cpp/include/IceSSL/RSAPublicKey.h b/cpp/include/IceSSL/RSAPublicKey.h
index 8592cdd4c2f..dc7baeffe25 100644
--- a/cpp/include/IceSSL/RSAPublicKey.h
+++ b/cpp/include/IceSSL/RSAPublicKey.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_PUBLIC_KEY_H
#define ICE_SSL_RSA_PUBLIC_KEY_H
diff --git a/cpp/include/IceSSL/RSAPublicKeyF.h b/cpp/include/IceSSL/RSAPublicKeyF.h
index 105553dc73b..853e3ae01fd 100644
--- a/cpp/include/IceSSL/RSAPublicKeyF.h
+++ b/cpp/include/IceSSL/RSAPublicKeyF.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-
#ifndef ICE_SSL_RSA_PUBLIC_KEY_F_H
#define ICE_SSL_RSA_PUBLIC_KEY_F_H
diff --git a/cpp/include/IceStorm/Makefile b/cpp/include/IceStorm/Makefile
index 75c7aca5f81..8247ff17ea7 100644
--- a/cpp/include/IceStorm/Makefile
+++ b/cpp/include/IceStorm/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h
index fb0e232e107..a3c7d93830d 100644
--- a/cpp/include/IceUtil/AbstractMutex.h
+++ b/cpp/include/IceUtil/AbstractMutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_ABSTRACT_MUTEX_H
#define ICE_UTIL_ABSTRACT_MUTEX_H
diff --git a/cpp/include/IceUtil/Algorithm.h b/cpp/include/IceUtil/Algorithm.h
index 341c4c3156f..75da41bdaf5 100644
--- a/cpp/include/IceUtil/Algorithm.h
+++ b/cpp/include/IceUtil/Algorithm.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_ALGORITHM_H
#define ICE_UTIL_ALGORITHM_H
diff --git a/cpp/include/IceUtil/Base64.h b/cpp/include/IceUtil/Base64.h
index b4909600b6c..4233a2c526a 100644
--- a/cpp/include/IceUtil/Base64.h
+++ b/cpp/include/IceUtil/Base64.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_BASE_64_H
#define ICE_UTIL_BASE_64_H
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index c185b418006..657e1ae1b22 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_CACHE_H
#define ICE_UTIL_CACHE_H
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h
index e076c9b3d2f..d7f914d86d2 100644
--- a/cpp/include/IceUtil/Cond.h
+++ b/cpp/include/IceUtil/Cond.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_COND_H
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index f457fc093ac..05de38222f9 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_CONFIG_H
diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h
index e85b3fc8031..1925c1c7306 100644
--- a/cpp/include/IceUtil/CountDownLatch.h
+++ b/cpp/include/IceUtil/CountDownLatch.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_COUNT_DOWN_LATCH_H
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 98d963371ab..b917391b3ad 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_CTRL_C_HANDLER_H
diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h
index 0010bab3d47..01d6a2f5fa4 100644
--- a/cpp/include/IceUtil/Exception.h
+++ b/cpp/include/IceUtil/Exception.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h
index c0fe7a8fa30..553c5ccae80 100644
--- a/cpp/include/IceUtil/Functional.h
+++ b/cpp/include/IceUtil/Functional.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_FUNCTIONAL_H
diff --git a/cpp/include/IceUtil/GC.h b/cpp/include/IceUtil/GC.h
index 2e1d5208de1..6959089501c 100644
--- a/cpp/include/IceUtil/GC.h
+++ b/cpp/include/IceUtil/GC.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_H
#define ICE_GC_H
diff --git a/cpp/include/IceUtil/GCRecMutex.h b/cpp/include/IceUtil/GCRecMutex.h
index f82ef2d7d4c..e917a67879e 100644
--- a/cpp/include/IceUtil/GCRecMutex.h
+++ b/cpp/include/IceUtil/GCRecMutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_REC_MUTEX_H
#define ICE_GC_REC_MUTEX_H
diff --git a/cpp/include/IceUtil/GCShared.h b/cpp/include/IceUtil/GCShared.h
index 18be995b2a6..7dffb3956e6 100644
--- a/cpp/include/IceUtil/GCShared.h
+++ b/cpp/include/IceUtil/GCShared.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_GC_SHARED_H
#define ICE_UTIL_GC_SHARED_H
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 26a0738ab9c..1e7a33be848 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_HANDLE_H
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 0b9d0117c6b..c2f9889320c 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_ICE_UTIL_H
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 8631d83bd8c..83f5427ecad 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_INPUT_UTIL_H
diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h
index ecb2a1dca69..d9e69896c73 100644
--- a/cpp/include/IceUtil/Iterator.h
+++ b/cpp/include/IceUtil/Iterator.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_ITERATOR_H
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 56d347b52c0..1821388c200 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_LOCK_H
diff --git a/cpp/include/IceUtil/Makefile b/cpp/include/IceUtil/Makefile
index 75f9045bc94..29fe0b0c3c3 100644
--- a/cpp/include/IceUtil/Makefile
+++ b/cpp/include/IceUtil/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h
index 63845f5338d..6416475bee7 100644
--- a/cpp/include/IceUtil/Monitor.h
+++ b/cpp/include/IceUtil/Monitor.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_MONITOR_H
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 7e01e767eab..d65245f85e2 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_MUTEX_H
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index d42bc8cee0a..3f95d2ef657 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_OUTPUT_UTIL_H
diff --git a/cpp/include/IceUtil/RWRecMutex.h b/cpp/include/IceUtil/RWRecMutex.h
index 163a0f98f0b..9c7c2673de0 100644
--- a/cpp/include/IceUtil/RWRecMutex.h
+++ b/cpp/include/IceUtil/RWRecMutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_RW_REC_MUTEX_H
#define ICE_UTIL_RW_REC_MUTEX_H
diff --git a/cpp/include/IceUtil/RecMutex.h b/cpp/include/IceUtil/RecMutex.h
index 0b284bd6bb7..d6ff0fe8966 100644
--- a/cpp/include/IceUtil/RecMutex.h
+++ b/cpp/include/IceUtil/RecMutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_RMUTEX_H
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index 2cbd20f3cad..699c8a3980d 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_SHARED_H
diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h
index 6dd867ae480..2c9a01a398f 100644
--- a/cpp/include/IceUtil/StaticMutex.h
+++ b/cpp/include/IceUtil/StaticMutex.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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_STATIC_MUTEX_H
#define ICE_UTIL_STATIC_MUTEX_H
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index a5d7699fc5c..16325a4489f 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_STRING_UTIL_H
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 8b2581097d5..d0a4a56193b 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_THREAD_H
diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h
index 65dbe4ace86..967bfe46da3 100644
--- a/cpp/include/IceUtil/ThreadException.h
+++ b/cpp/include/IceUtil/ThreadException.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_THREAD_EXCEPTION_H
diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h
index e4d4c20e025..776e6c56354 100644
--- a/cpp/include/IceUtil/Time.h
+++ b/cpp/include/IceUtil/Time.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_TIME_H
diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h
index 5a0a4afa506..99de077d0a9 100644
--- a/cpp/include/IceUtil/UUID.h
+++ b/cpp/include/IceUtil/UUID.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_UUID_H
diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h
index 9f986891c24..c548db9307b 100644
--- a/cpp/include/IceUtil/Unicode.h
+++ b/cpp/include/IceUtil/Unicode.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_UTIL_UNICODE_H
diff --git a/cpp/include/IceXML/Makefile b/cpp/include/IceXML/Makefile
index e9574c23767..ab3f18e2cde 100644
--- a/cpp/include/IceXML/Makefile
+++ b/cpp/include/IceXML/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h
index 7c6332a5213..5344becdf52 100644
--- a/cpp/include/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All rights 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
#define ICE_XML_PARSER_H
diff --git a/cpp/include/Makefile b/cpp/include/Makefile
index be8b09162d2..c3d1799b9b1 100644
--- a/cpp/include/Makefile
+++ b/cpp/include/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 8fc4f03e5a4..21bef134e9a 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All 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
#define C_PLUS_PLUS_UTIL_H
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index 08ea6bc3c20..a96c9aa9b4d 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All 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
#define CS_UTIL_H
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index 79681a06b17..bc1e5efc514 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All 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
#define JAVA_UTIL_H
diff --git a/cpp/include/Slice/Makefile b/cpp/include/Slice/Makefile
index c8ad333ef18..6a1108f360c 100644
--- a/cpp/include/Slice/Makefile
+++ b/cpp/include/Slice/Makefile
@@ -1,17 +1,12 @@
# **********************************************************************
#
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. 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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 22a32857c13..f1a47e5a0eb 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All 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
#define SLICE_PARSER_H
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 5b1e66f7f03..7e6f89179e1 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -1,17 +1,12 @@
// **********************************************************************
//
-// Copyright (c) 2003 - 2004
-// ZeroC, Inc.
-// North Palm Beach, FL, USA
-//
-// All Rights Reserved.
+// Copyright (c) 2003-2004 ZeroC, Inc. All 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
#define PREPROCESSOR_H