summaryrefslogtreecommitdiff
path: root/cpp/slice
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/slice')
-rwxr-xr-xcpp/slice/Freeze/Connection.ice6
-rw-r--r--cpp/slice/Freeze/ConnectionF.ice7
-rw-r--r--cpp/slice/Freeze/DB.ice7
-rw-r--r--cpp/slice/Freeze/Evictor.ice7
-rw-r--r--cpp/slice/Freeze/EvictorF.ice7
-rw-r--r--cpp/slice/Freeze/EvictorStorage.ice7
-rw-r--r--cpp/slice/Freeze/Exception.ice7
-rw-r--r--cpp/slice/Freeze/Makefile7
-rwxr-xr-xcpp/slice/Freeze/Transaction.ice6
-rw-r--r--cpp/slice/Glacier/Makefile7
-rw-r--r--cpp/slice/Glacier/Router.ice7
-rw-r--r--cpp/slice/Glacier/Session.ice7
-rw-r--r--cpp/slice/Glacier/SessionF.ice7
-rw-r--r--cpp/slice/Glacier/SessionManager.ice7
-rw-r--r--cpp/slice/Glacier/SessionManagerF.ice7
-rw-r--r--cpp/slice/Glacier/Starter.ice7
-rw-r--r--cpp/slice/Ice/BuiltinSequences.ice7
-rw-r--r--cpp/slice/Ice/Communicator.ice7
-rw-r--r--cpp/slice/Ice/CommunicatorF.ice7
-rw-r--r--cpp/slice/Ice/Current.ice7
-rw-r--r--cpp/slice/Ice/FacetMap.ice6
-rw-r--r--cpp/slice/Ice/Identity.ice7
-rw-r--r--cpp/slice/Ice/LocalException.ice7
-rw-r--r--cpp/slice/Ice/Locator.ice7
-rw-r--r--cpp/slice/Ice/LocatorF.ice7
-rw-r--r--cpp/slice/Ice/Logger.ice7
-rw-r--r--cpp/slice/Ice/LoggerF.ice7
-rw-r--r--cpp/slice/Ice/Makefile7
-rw-r--r--cpp/slice/Ice/ObjectAdapter.ice7
-rw-r--r--cpp/slice/Ice/ObjectAdapterF.ice7
-rw-r--r--cpp/slice/Ice/ObjectFactory.ice7
-rw-r--r--cpp/slice/Ice/ObjectFactoryF.ice7
-rw-r--r--cpp/slice/Ice/Plugin.ice7
-rw-r--r--cpp/slice/Ice/PluginF.ice7
-rw-r--r--cpp/slice/Ice/Process.ice7
-rw-r--r--cpp/slice/Ice/ProcessF.ice7
-rw-r--r--cpp/slice/Ice/Properties.ice7
-rw-r--r--cpp/slice/Ice/PropertiesF.ice7
-rw-r--r--cpp/slice/Ice/Router.ice7
-rw-r--r--cpp/slice/Ice/RouterF.ice7
-rw-r--r--cpp/slice/Ice/ServantLocator.ice7
-rw-r--r--cpp/slice/Ice/ServantLocatorF.ice7
-rw-r--r--cpp/slice/Ice/Stats.ice7
-rw-r--r--cpp/slice/Ice/StatsF.ice7
-rw-r--r--cpp/slice/IceBox/IceBox.ice7
-rw-r--r--cpp/slice/IceBox/Makefile7
-rw-r--r--cpp/slice/IcePack/Admin.ice7
-rw-r--r--cpp/slice/IcePack/Exception.ice7
-rw-r--r--cpp/slice/IcePack/Makefile7
-rw-r--r--cpp/slice/IcePack/Query.ice7
-rw-r--r--cpp/slice/IcePatch/IcePatch.ice7
-rw-r--r--cpp/slice/IcePatch/Makefile7
-rw-r--r--cpp/slice/IceSSL/CertificateVerifier.ice7
-rw-r--r--cpp/slice/IceSSL/CertificateVerifierF.ice7
-rw-r--r--cpp/slice/IceSSL/Exception.ice7
-rw-r--r--cpp/slice/IceSSL/Makefile7
-rw-r--r--cpp/slice/IceSSL/Plugin.ice7
-rw-r--r--cpp/slice/IceSSL/PluginF.ice7
-rw-r--r--cpp/slice/IceStorm/IceStorm.ice7
-rw-r--r--cpp/slice/IceStorm/Makefile7
-rw-r--r--cpp/slice/Makefile7
61 files changed, 61 insertions, 363 deletions
diff --git a/cpp/slice/Freeze/Connection.ice b/cpp/slice/Freeze/Connection.ice
index 9bce802571a..48469990a25 100755
--- a/cpp/slice/Freeze/Connection.ice
+++ b/cpp/slice/Freeze/Connection.ice
@@ -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/slice/Freeze/ConnectionF.ice b/cpp/slice/Freeze/ConnectionF.ice
index 329e0938f41..da45ef305a3 100644
--- a/cpp/slice/Freeze/ConnectionF.ice
+++ b/cpp/slice/Freeze/ConnectionF.ice
@@ -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_CONNECTION_F_ICE
#define FREEZE_CONNECTION_F_ICE
diff --git a/cpp/slice/Freeze/DB.ice b/cpp/slice/Freeze/DB.ice
index 2c88fd7fb65..35d019d55fe 100644
--- a/cpp/slice/Freeze/DB.ice
+++ b/cpp/slice/Freeze/DB.ice
@@ -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_DB_ICE
#define FREEZE_DB_ICE
diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice
index 7e5edddca18..129dbcb9ab3 100644
--- a/cpp/slice/Freeze/Evictor.ice
+++ b/cpp/slice/Freeze/Evictor.ice
@@ -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_EVICTOR_ICE
#define FREEZE_EVICTOR_ICE
diff --git a/cpp/slice/Freeze/EvictorF.ice b/cpp/slice/Freeze/EvictorF.ice
index 30526f18c2e..fcfb7e42b8a 100644
--- a/cpp/slice/Freeze/EvictorF.ice
+++ b/cpp/slice/Freeze/EvictorF.ice
@@ -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_EVICTOR_F_ICE
#define FREEZE_EVICTOR_F_ICE
diff --git a/cpp/slice/Freeze/EvictorStorage.ice b/cpp/slice/Freeze/EvictorStorage.ice
index 7e0c437a258..9de73877341 100644
--- a/cpp/slice/Freeze/EvictorStorage.ice
+++ b/cpp/slice/Freeze/EvictorStorage.ice
@@ -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_EVICTOR_STORAGE_ICE
#define FREEZE_EVICTOR_STORAGE_ICE
diff --git a/cpp/slice/Freeze/Exception.ice b/cpp/slice/Freeze/Exception.ice
index 9c2bd783b91..b74aece1c51 100644
--- a/cpp/slice/Freeze/Exception.ice
+++ b/cpp/slice/Freeze/Exception.ice
@@ -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_EXCEPTION_ICE
#define FREEZE_EXCEPTION_ICE
diff --git a/cpp/slice/Freeze/Makefile b/cpp/slice/Freeze/Makefile
index d20798a8ec9..1a55e76a778 100644
--- a/cpp/slice/Freeze/Makefile
+++ b/cpp/slice/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/slice/Freeze/Transaction.ice b/cpp/slice/Freeze/Transaction.ice
index 2756ca861fb..bcf435d79ce 100755
--- a/cpp/slice/Freeze/Transaction.ice
+++ b/cpp/slice/Freeze/Transaction.ice
@@ -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/slice/Glacier/Makefile b/cpp/slice/Glacier/Makefile
index c2435235926..8f7f3ba645b 100644
--- a/cpp/slice/Glacier/Makefile
+++ b/cpp/slice/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/slice/Glacier/Router.ice b/cpp/slice/Glacier/Router.ice
index 58effff1059..872291100e2 100644
--- a/cpp/slice/Glacier/Router.ice
+++ b/cpp/slice/Glacier/Router.ice
@@ -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_ROUTER_ICE
#define GLACIER_ROUTER_ICE
diff --git a/cpp/slice/Glacier/Session.ice b/cpp/slice/Glacier/Session.ice
index c89528fdf1f..4b0857a9442 100644
--- a/cpp/slice/Glacier/Session.ice
+++ b/cpp/slice/Glacier/Session.ice
@@ -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_SESSION_ICE
#define GLACIER_SESSION_ICE
diff --git a/cpp/slice/Glacier/SessionF.ice b/cpp/slice/Glacier/SessionF.ice
index 05e72069fb9..1d6d5819701 100644
--- a/cpp/slice/Glacier/SessionF.ice
+++ b/cpp/slice/Glacier/SessionF.ice
@@ -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_SESSION_F_ICE
#define GLACIER_SESSION_F_ICE
diff --git a/cpp/slice/Glacier/SessionManager.ice b/cpp/slice/Glacier/SessionManager.ice
index 0375a8cda21..a7836588ae2 100644
--- a/cpp/slice/Glacier/SessionManager.ice
+++ b/cpp/slice/Glacier/SessionManager.ice
@@ -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_SESSION_MANAGER_ICE
#define GLACIER_SESSION_MANAGER_ICE
diff --git a/cpp/slice/Glacier/SessionManagerF.ice b/cpp/slice/Glacier/SessionManagerF.ice
index d589d7f524c..1c759f5962d 100644
--- a/cpp/slice/Glacier/SessionManagerF.ice
+++ b/cpp/slice/Glacier/SessionManagerF.ice
@@ -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_SESSION_MANAGER_F_ICE
#define GLACIER_SESSION_MANAGER_F_ICE
diff --git a/cpp/slice/Glacier/Starter.ice b/cpp/slice/Glacier/Starter.ice
index 8454dc38059..61493bda755 100644
--- a/cpp/slice/Glacier/Starter.ice
+++ b/cpp/slice/Glacier/Starter.ice
@@ -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_ICE
#define GLACIER_ICE
diff --git a/cpp/slice/Ice/BuiltinSequences.ice b/cpp/slice/Ice/BuiltinSequences.ice
index 7824ebae253..82b7e41f5b8 100644
--- a/cpp/slice/Ice/BuiltinSequences.ice
+++ b/cpp/slice/Ice/BuiltinSequences.ice
@@ -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_BUILTIN_SEQUENCES_ICE
#define ICE_BUILTIN_SEQUENCES_ICE
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice
index e8958149dae..e4cd961bd23 100644
--- a/cpp/slice/Ice/Communicator.ice
+++ b/cpp/slice/Ice/Communicator.ice
@@ -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_COMMUNICATOR_ICE
#define ICE_COMMUNICATOR_ICE
diff --git a/cpp/slice/Ice/CommunicatorF.ice b/cpp/slice/Ice/CommunicatorF.ice
index 2b2f83d1589..3828fe3cd44 100644
--- a/cpp/slice/Ice/CommunicatorF.ice
+++ b/cpp/slice/Ice/CommunicatorF.ice
@@ -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_COMMUNICATOR_F_ICE
#define ICE_COMMUNICATOR_F_ICE
diff --git a/cpp/slice/Ice/Current.ice b/cpp/slice/Ice/Current.ice
index ee569bf2a25..27d53a59022 100644
--- a/cpp/slice/Ice/Current.ice
+++ b/cpp/slice/Ice/Current.ice
@@ -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_CURRENT_ICE
#define ICE_CURRENT_ICE
diff --git a/cpp/slice/Ice/FacetMap.ice b/cpp/slice/Ice/FacetMap.ice
index db869ddc0dc..e02734274c8 100644
--- a/cpp/slice/Ice/FacetMap.ice
+++ b/cpp/slice/Ice/FacetMap.ice
@@ -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/slice/Ice/Identity.ice b/cpp/slice/Ice/Identity.ice
index beb1a5c75bd..5387b203890 100644
--- a/cpp/slice/Ice/Identity.ice
+++ b/cpp/slice/Ice/Identity.ice
@@ -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_ICE
#define ICE_IDENTITY_ICE
diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice
index dd20382b44e..50a0a65e8c9 100644
--- a/cpp/slice/Ice/LocalException.ice
+++ b/cpp/slice/Ice/LocalException.ice
@@ -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_EXCEPTION_ICE
#define ICE_LOCAL_EXCEPTION_ICE
diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice
index 21af0c51896..cca6cbebd70 100644
--- a/cpp/slice/Ice/Locator.ice
+++ b/cpp/slice/Ice/Locator.ice
@@ -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_LOCATOR_ICE
#define ICE_LOCATOR_ICE
diff --git a/cpp/slice/Ice/LocatorF.ice b/cpp/slice/Ice/LocatorF.ice
index be175252758..bc432460ef6 100644
--- a/cpp/slice/Ice/LocatorF.ice
+++ b/cpp/slice/Ice/LocatorF.ice
@@ -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_LOCATOR_F_ICE
#define ICE_LOCATOR_F_ICE
diff --git a/cpp/slice/Ice/Logger.ice b/cpp/slice/Ice/Logger.ice
index 700618503e7..20f58257b0f 100644
--- a/cpp/slice/Ice/Logger.ice
+++ b/cpp/slice/Ice/Logger.ice
@@ -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_ICE
#define ICE_LOGGER_ICE
diff --git a/cpp/slice/Ice/LoggerF.ice b/cpp/slice/Ice/LoggerF.ice
index d3684e06fa5..0d0b9b6cd69 100644
--- a/cpp/slice/Ice/LoggerF.ice
+++ b/cpp/slice/Ice/LoggerF.ice
@@ -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_F_ICE
#define ICE_LOGGER_F_ICE
diff --git a/cpp/slice/Ice/Makefile b/cpp/slice/Ice/Makefile
index 342eb433343..528d3502c29 100644
--- a/cpp/slice/Ice/Makefile
+++ b/cpp/slice/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/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index a65dc383467..80b3011cc53 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -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_ICE
#define ICE_OBJECT_ADAPTER_ICE
diff --git a/cpp/slice/Ice/ObjectAdapterF.ice b/cpp/slice/Ice/ObjectAdapterF.ice
index 433b1683409..c999ec21752 100644
--- a/cpp/slice/Ice/ObjectAdapterF.ice
+++ b/cpp/slice/Ice/ObjectAdapterF.ice
@@ -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_F_ICE
#define ICE_OBJECT_ADAPTER_F_ICE
diff --git a/cpp/slice/Ice/ObjectFactory.ice b/cpp/slice/Ice/ObjectFactory.ice
index 7e482487b7c..1bf7fa64acf 100644
--- a/cpp/slice/Ice/ObjectFactory.ice
+++ b/cpp/slice/Ice/ObjectFactory.ice
@@ -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_FACTORY_ICE
#define ICE_OBJECT_FACTORY_ICE
diff --git a/cpp/slice/Ice/ObjectFactoryF.ice b/cpp/slice/Ice/ObjectFactoryF.ice
index 8c21c25a2c1..9afd80df646 100644
--- a/cpp/slice/Ice/ObjectFactoryF.ice
+++ b/cpp/slice/Ice/ObjectFactoryF.ice
@@ -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_FACTORY_F_ICE
#define ICE_SERVANT_FACTORY_F_ICE
diff --git a/cpp/slice/Ice/Plugin.ice b/cpp/slice/Ice/Plugin.ice
index 870e6cf119f..5ac62c1b166 100644
--- a/cpp/slice/Ice/Plugin.ice
+++ b/cpp/slice/Ice/Plugin.ice
@@ -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_PLUGIN_ICE
#define ICE_PLUGIN_ICE
diff --git a/cpp/slice/Ice/PluginF.ice b/cpp/slice/Ice/PluginF.ice
index 2992eb8a034..8a9247b7bcc 100644
--- a/cpp/slice/Ice/PluginF.ice
+++ b/cpp/slice/Ice/PluginF.ice
@@ -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_PLUGIN_F_ICE
#define ICE_PLUGIN_F_ICE
diff --git a/cpp/slice/Ice/Process.ice b/cpp/slice/Ice/Process.ice
index 61f2076a71d..f6677c7082d 100644
--- a/cpp/slice/Ice/Process.ice
+++ b/cpp/slice/Ice/Process.ice
@@ -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_PROCESS_ICE
#define ICE_PROCESS_ICE
diff --git a/cpp/slice/Ice/ProcessF.ice b/cpp/slice/Ice/ProcessF.ice
index a18e9c1f7b7..e88eb3c9fde 100644
--- a/cpp/slice/Ice/ProcessF.ice
+++ b/cpp/slice/Ice/ProcessF.ice
@@ -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_PROCESS_F_ICE
#define ICE_PROCESS_F_ICE
diff --git a/cpp/slice/Ice/Properties.ice b/cpp/slice/Ice/Properties.ice
index 7fbdb5f4f1b..24d5ecff7d0 100644
--- a/cpp/slice/Ice/Properties.ice
+++ b/cpp/slice/Ice/Properties.ice
@@ -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_PROPERTIES_ICE
#define ICE_PROPERTIES_ICE
diff --git a/cpp/slice/Ice/PropertiesF.ice b/cpp/slice/Ice/PropertiesF.ice
index a7a7f751443..a5ea5bd6139 100644
--- a/cpp/slice/Ice/PropertiesF.ice
+++ b/cpp/slice/Ice/PropertiesF.ice
@@ -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_PROPERTIES_F_ICE
#define ICE_PROPERTIES_F_ICE
diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice
index b4ca9990ce6..90b8af6811e 100644
--- a/cpp/slice/Ice/Router.ice
+++ b/cpp/slice/Ice/Router.ice
@@ -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_ROUTER_ICE
#define ICE_ROUTER_ICE
diff --git a/cpp/slice/Ice/RouterF.ice b/cpp/slice/Ice/RouterF.ice
index f78734f812f..2c0bb1fbe8c 100644
--- a/cpp/slice/Ice/RouterF.ice
+++ b/cpp/slice/Ice/RouterF.ice
@@ -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_ROUTER_F_ICE
#define ICE_ROUTER_F_ICE
diff --git a/cpp/slice/Ice/ServantLocator.ice b/cpp/slice/Ice/ServantLocator.ice
index 5e67c2a973c..22bbfdeb9ae 100644
--- a/cpp/slice/Ice/ServantLocator.ice
+++ b/cpp/slice/Ice/ServantLocator.ice
@@ -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_LOCATOR_ICE
#define ICE_SERVANT_LOCATOR_ICE
diff --git a/cpp/slice/Ice/ServantLocatorF.ice b/cpp/slice/Ice/ServantLocatorF.ice
index eca0ff2b99b..ad931dad52f 100644
--- a/cpp/slice/Ice/ServantLocatorF.ice
+++ b/cpp/slice/Ice/ServantLocatorF.ice
@@ -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_LOCATOR_F_ICE
#define ICE_SERVANT_LOCATOR_F_ICE
diff --git a/cpp/slice/Ice/Stats.ice b/cpp/slice/Ice/Stats.ice
index a9a68f6c9d6..c2a549483b9 100644
--- a/cpp/slice/Ice/Stats.ice
+++ b/cpp/slice/Ice/Stats.ice
@@ -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_STATS_ICE
#define ICE_STATS_ICE
diff --git a/cpp/slice/Ice/StatsF.ice b/cpp/slice/Ice/StatsF.ice
index 7b04808ab66..6d232cb7953 100644
--- a/cpp/slice/Ice/StatsF.ice
+++ b/cpp/slice/Ice/StatsF.ice
@@ -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_STATS_F_ICE
#define ICE_STATS_F_ICE
diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice
index 5b7dffe9a91..a18eae06937 100644
--- a/cpp/slice/IceBox/IceBox.ice
+++ b/cpp/slice/IceBox/IceBox.ice
@@ -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_BOX_ICE_BOX_ICE
#define ICE_BOX_ICE_BOX_ICE
diff --git a/cpp/slice/IceBox/Makefile b/cpp/slice/IceBox/Makefile
index 50675bf3727..a884ecf93cc 100644
--- a/cpp/slice/IceBox/Makefile
+++ b/cpp/slice/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/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice
index 5b60a6e0e7b..59a86e74bbe 100644
--- a/cpp/slice/IcePack/Admin.ice
+++ b/cpp/slice/IcePack/Admin.ice
@@ -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_PACK_ADMIN_ICE
#define ICE_PACK_ADMIN_ICE
diff --git a/cpp/slice/IcePack/Exception.ice b/cpp/slice/IcePack/Exception.ice
index 26436a27688..443a6a7c217 100644
--- a/cpp/slice/IcePack/Exception.ice
+++ b/cpp/slice/IcePack/Exception.ice
@@ -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_PACK_EXCEPTION_ICE
#define ICE_PACK_EXCEPTION_ICE
diff --git a/cpp/slice/IcePack/Makefile b/cpp/slice/IcePack/Makefile
index cd22ffd2d7a..b6f8d7d20ca 100644
--- a/cpp/slice/IcePack/Makefile
+++ b/cpp/slice/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/slice/IcePack/Query.ice b/cpp/slice/IcePack/Query.ice
index 69d202b7920..4bb9d549763 100644
--- a/cpp/slice/IcePack/Query.ice
+++ b/cpp/slice/IcePack/Query.ice
@@ -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_PACK_QUERY_ICE
#define ICE_PACK_QUERY_ICE
diff --git a/cpp/slice/IcePatch/IcePatch.ice b/cpp/slice/IcePatch/IcePatch.ice
index 9189b511682..132c4c7ebd6 100644
--- a/cpp/slice/IcePatch/IcePatch.ice
+++ b/cpp/slice/IcePatch/IcePatch.ice
@@ -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_ICE_PATCH_ICE
#define ICE_PATCH_ICE_PATCH_ICE
diff --git a/cpp/slice/IcePatch/Makefile b/cpp/slice/IcePatch/Makefile
index 26514c12a2d..11b4a7ac2db 100644
--- a/cpp/slice/IcePatch/Makefile
+++ b/cpp/slice/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/slice/IceSSL/CertificateVerifier.ice b/cpp/slice/IceSSL/CertificateVerifier.ice
index 842ebb09a76..2ab9f67eb36 100644
--- a/cpp/slice/IceSSL/CertificateVerifier.ice
+++ b/cpp/slice/IceSSL/CertificateVerifier.ice
@@ -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_ICE
#define ICE_SSL_CERTIFICATE_VERIFIER_ICE
diff --git a/cpp/slice/IceSSL/CertificateVerifierF.ice b/cpp/slice/IceSSL/CertificateVerifierF.ice
index 1637d61c8c1..18615eca48b 100644
--- a/cpp/slice/IceSSL/CertificateVerifierF.ice
+++ b/cpp/slice/IceSSL/CertificateVerifierF.ice
@@ -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_F_ICE
#define ICE_SSL_CERTIFICATE_VERIFIER_F_ICE
diff --git a/cpp/slice/IceSSL/Exception.ice b/cpp/slice/IceSSL/Exception.ice
index 85de44199e2..ecc38057f30 100644
--- a/cpp/slice/IceSSL/Exception.ice
+++ b/cpp/slice/IceSSL/Exception.ice
@@ -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_EXCEPTION_ICE
#define ICE_SSL_EXCEPTION_ICE
diff --git a/cpp/slice/IceSSL/Makefile b/cpp/slice/IceSSL/Makefile
index 0ff025a10c9..120dd07d17d 100644
--- a/cpp/slice/IceSSL/Makefile
+++ b/cpp/slice/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/slice/IceSSL/Plugin.ice b/cpp/slice/IceSSL/Plugin.ice
index e0f336167de..7150fde916c 100644
--- a/cpp/slice/IceSSL/Plugin.ice
+++ b/cpp/slice/IceSSL/Plugin.ice
@@ -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_PLUGIN_ICE
#define ICE_SSL_PLUGIN_ICE
diff --git a/cpp/slice/IceSSL/PluginF.ice b/cpp/slice/IceSSL/PluginF.ice
index b706f560a4c..db464eaf86c 100644
--- a/cpp/slice/IceSSL/PluginF.ice
+++ b/cpp/slice/IceSSL/PluginF.ice
@@ -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_PLUGIN_F_ICE
#define ICE_SSL_PLUGIN_F_ICE
diff --git a/cpp/slice/IceStorm/IceStorm.ice b/cpp/slice/IceStorm/IceStorm.ice
index d359d572ad6..01d089f99fd 100644
--- a/cpp/slice/IceStorm/IceStorm.ice
+++ b/cpp/slice/IceStorm/IceStorm.ice
@@ -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_STORM_ICE
#define ICE_STORM_ICE
diff --git a/cpp/slice/IceStorm/Makefile b/cpp/slice/IceStorm/Makefile
index 15041e34d6b..acd1beafc39 100644
--- a/cpp/slice/IceStorm/Makefile
+++ b/cpp/slice/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/slice/Makefile b/cpp/slice/Makefile
index 96b63f42e3c..9539daadbb7 100644
--- a/cpp/slice/Makefile
+++ b/cpp/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