summaryrefslogtreecommitdiff
path: root/cpp/demo/Freeze
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/Freeze')
-rw-r--r--cpp/demo/Freeze/Makefile7
-rw-r--r--cpp/demo/Freeze/backup/Client.cpp7
-rw-r--r--cpp/demo/Freeze/backup/Makefile7
-rw-r--r--cpp/demo/Freeze/bench/Client.cpp7
-rw-r--r--cpp/demo/Freeze/bench/Makefile7
-rw-r--r--cpp/demo/Freeze/bench/Test.ice7
-rw-r--r--cpp/demo/Freeze/library/BookFactory.cpp7
-rw-r--r--cpp/demo/Freeze/library/BookFactory.h7
-rw-r--r--cpp/demo/Freeze/library/Client.cpp7
-rw-r--r--cpp/demo/Freeze/library/Collocated.cpp7
-rw-r--r--cpp/demo/Freeze/library/Grammar.y7
-rw-r--r--cpp/demo/Freeze/library/Library.ice7
-rw-r--r--cpp/demo/Freeze/library/LibraryI.cpp7
-rw-r--r--cpp/demo/Freeze/library/LibraryI.h7
-rw-r--r--cpp/demo/Freeze/library/Makefile7
-rw-r--r--cpp/demo/Freeze/library/Parser.cpp7
-rw-r--r--cpp/demo/Freeze/library/Parser.h7
-rw-r--r--cpp/demo/Freeze/library/RunParser.cpp7
-rw-r--r--cpp/demo/Freeze/library/Scanner.l7
-rw-r--r--cpp/demo/Freeze/library/Server.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/Client.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/Collocated.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.h7
-rw-r--r--cpp/demo/Freeze/phonebook/Grammar.y7
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile7
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.h7
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBook.ice7
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/PhoneBookI.h7
-rw-r--r--cpp/demo/Freeze/phonebook/RunParser.cpp7
-rw-r--r--cpp/demo/Freeze/phonebook/Scanner.l7
-rw-r--r--cpp/demo/Freeze/phonebook/Server.cpp7
34 files changed, 34 insertions, 204 deletions
diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile
index 5ed12a2038d..f900c84fd75 100644
--- a/cpp/demo/Freeze/Makefile
+++ b/cpp/demo/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/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp
index 8e927eda27f..5baa5477ee1 100644
--- a/cpp/demo/Freeze/backup/Client.cpp
+++ b/cpp/demo/Freeze/backup/Client.cpp
@@ -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.
//
// **********************************************************************
-
#include <IntLongMap.h>
#include <IceUtil/Time.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile
index faee7ad17a3..8bfa27f1f50 100644
--- a/cpp/demo/Freeze/backup/Makefile
+++ b/cpp/demo/Freeze/backup/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 = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 3fdab602785..156a0b52bd5 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <Freeze/Freeze.h>
#include <BenchTypes.h>
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index 44da66ee36b..c45861c9b42 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/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 = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice
index d32b95cb2f9..40dfef6a96e 100644
--- a/cpp/demo/Freeze/bench/Test.ice
+++ b/cpp/demo/Freeze/bench/Test.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.
//
// **********************************************************************
-
struct Struct1
{
long l;
diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp
index 55db8e07182..d591fc6fa43 100644
--- a/cpp/demo/Freeze/library/BookFactory.cpp
+++ b/cpp/demo/Freeze/library/BookFactory.cpp
@@ -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.
//
// **********************************************************************
-
#include <BookFactory.h>
using namespace std;
diff --git a/cpp/demo/Freeze/library/BookFactory.h b/cpp/demo/Freeze/library/BookFactory.h
index 1730ab61862..11226b6c457 100644
--- a/cpp/demo/Freeze/library/BookFactory.h
+++ b/cpp/demo/Freeze/library/BookFactory.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 BOOK_FACTORY_H
#define BOOK_FACTORY_H
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index c70e171dcc5..c004078a30c 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 06b7745156f..515a4a09497 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <BookFactory.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Grammar.y b/cpp/demo/Freeze/library/Grammar.y
index e3c9346149f..ac784a7e854 100644
--- a/cpp/demo/Freeze/library/Grammar.y
+++ b/cpp/demo/Freeze/library/Grammar.y
@@ -2,18 +2,13 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index e437c235493..915aa6bff4c 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.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 LIBRARY_ICE
#define LIBRARY_ICE
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index 1ed4bce7d9c..72fe7615165 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -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.
//
// **********************************************************************
-
#include <Freeze/Freeze.h>
#include <LibraryI.h>
diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h
index 2a51f77c168..5eb2c8c34d6 100644
--- a/cpp/demo/Freeze/library/LibraryI.h
+++ b/cpp/demo/Freeze/library/LibraryI.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 LIBRARY_I_H
#define LIBRARY_I_H
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index 96ad95996ed..7024d7723bd 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/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 = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 8028e306a52..14cce4c9550 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index a3650b9cd51..dbeb64016db 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/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 PARSER_H
#define PARSER_H
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index f7d1bbd5d55..25b938858df 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l
index 96cbb62a4b3..0d896de41a1 100644
--- a/cpp/demo/Freeze/library/Scanner.l
+++ b/cpp/demo/Freeze/library/Scanner.l
@@ -2,18 +2,13 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
#include <Grammar.h>
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index 9d496a4c56a..859b2e9304d 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <BookFactory.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index 7b21c8a07f0..933c07117c0 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 1f98f3a1509..e73f717d15b 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <ContactFactory.h>
#include <NameIndex.h>
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
index a596a7872b2..40e0b3e8e9f 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
@@ -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.
//
// **********************************************************************
-
#include <ContactFactory.h>
#include <PhoneBookI.h>
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.h b/cpp/demo/Freeze/phonebook/ContactFactory.h
index f980052673a..508aa6da0a1 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.h
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.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 CONTACT_FACTORY_H
#define CONTACT_FACTORY_H
diff --git a/cpp/demo/Freeze/phonebook/Grammar.y b/cpp/demo/Freeze/phonebook/Grammar.y
index 7cbb21d2773..f3694a920d2 100644
--- a/cpp/demo/Freeze/phonebook/Grammar.y
+++ b/cpp/demo/Freeze/phonebook/Grammar.y
@@ -2,18 +2,13 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 23c805b7794..4d3809a6a48 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -1,18 +1,13 @@
# **********************************************************************
#
-# 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 = ../../..
CLIENT = client
diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp
index 8bffb61f96f..b029e5e24f4 100644
--- a/cpp/demo/Freeze/phonebook/Parser.cpp
+++ b/cpp/demo/Freeze/phonebook/Parser.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index 34890d7f5f5..138524b1548 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/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 PARSER_H
#define PARSER_H
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index ddbe5fafb7b..06fc5a4b33a 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.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 PHONE_BOOK_ICE
#define PHONE_BOOK_ICE
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index 23f62f2fcc7..1cb31d9fabf 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -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.
//
// **********************************************************************
-
#include <PhoneBookI.h>
#include <IceUtil/UUID.h>
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h
index 4bae446e71e..66594a2efc8 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.h
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.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 PHONE_BOOK_I_H
#define PHONE_BOOK_I_H
diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp
index 5e5823194fe..96e227607ac 100644
--- a/cpp/demo/Freeze/phonebook/RunParser.cpp
+++ b/cpp/demo/Freeze/phonebook/RunParser.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l
index de99029de14..d971abce6ac 100644
--- a/cpp/demo/Freeze/phonebook/Scanner.l
+++ b/cpp/demo/Freeze/phonebook/Scanner.l
@@ -2,18 +2,13 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
-
#include <Ice/Ice.h>
#include <Parser.h>
#include <Grammar.h>
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index c65b1789a15..2a38062f77c 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -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.
//
// **********************************************************************
-
#include <Ice/Application.h>
#include <ContactFactory.h>
#include <NameIndex.h>