diff options
| author | Mark Spruiell <mes@zeroc.com> | 2002-10-28 21:30:59 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2002-10-28 21:30:59 +0000 |
| commit | c3a7ee7098d062f59fa3e3953acc4347f92bb8f7 (patch) | |
| tree | 9e8b873c15285e245caaafc5188b6d3f3a9b5be3 /cpp/test | |
| parent | Fixes for Win32 (diff) | |
| download | ice-c3a7ee7098d062f59fa3e3953acc4347f92bb8f7.tar.bz2 ice-c3a7ee7098d062f59fa3e3953acc4347f92bb8f7.tar.xz ice-c3a7ee7098d062f59fa3e3953acc4347f92bb8f7.zip | |
changing copyright location; adding GPL note
Diffstat (limited to 'cpp/test')
298 files changed, 2022 insertions, 930 deletions
diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile index 1055bc61b92..b45bf1a6338 100644 --- a/cpp/test/Freeze/Makefile +++ b/cpp/test/Freeze/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp index 2b47fe9e88e..0e191dd8a40 100644 --- a/cpp/test/Freeze/complex/Client.cpp +++ b/cpp/test/Freeze/complex/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Complex.ice b/cpp/test/Freeze/complex/Complex.ice index 193d82f3ce4..c7d613c74ad 100644 --- a/cpp/test/Freeze/complex/Complex.ice +++ b/cpp/test/Freeze/complex/Complex.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Grammar.y b/cpp/test/Freeze/complex/Grammar.y index d8d2d544148..527403d938f 100644 --- a/cpp/test/Freeze/complex/Grammar.y +++ b/cpp/test/Freeze/complex/Grammar.y @@ -4,9 +4,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index 24afa2b0589..3c403eb7a69 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h index 8ae5b3e7cfd..4bece6c4c31 100644 --- a/cpp/test/Freeze/complex/NodeI.h +++ b/cpp/test/Freeze/complex/NodeI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp index cc7ca515cbe..e14eb0be0db 100644 --- a/cpp/test/Freeze/complex/Parser.cpp +++ b/cpp/test/Freeze/complex/Parser.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h index 246b23423a3..1b6786ce3ef 100644 --- a/cpp/test/Freeze/complex/Parser.h +++ b/cpp/test/Freeze/complex/Parser.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l index 220fd044284..8b690d5fcd0 100644 --- a/cpp/test/Freeze/complex/Scanner.l +++ b/cpp/test/Freeze/complex/Scanner.l @@ -4,9 +4,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py index ce61aad3f14..10e50337def 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/cursor/Client.cpp b/cpp/test/Freeze/cursor/Client.cpp index fa6bd2bb4a6..033ce1aecb8 100644 --- a/cpp/test/Freeze/cursor/Client.cpp +++ b/cpp/test/Freeze/cursor/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/cursor/Makefile b/cpp/test/Freeze/cursor/Makefile index 025fec64496..f35a6fafda3 100644 --- a/cpp/test/Freeze/cursor/Makefile +++ b/cpp/test/Freeze/cursor/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/cursor/run.py b/cpp/test/Freeze/cursor/run.py index 1ce91f819ba..3b29d87f78a 100755 --- a/cpp/test/Freeze/cursor/run.py +++ b/cpp/test/Freeze/cursor/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp index 46291680be2..8f944502135 100644 --- a/cpp/test/Freeze/dbmap/Client.cpp +++ b/cpp/test/Freeze/dbmap/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile index c88a0d3dbad..530f1c104f1 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py index f549b1a4f16..d3110bbaf90 100755 --- a/cpp/test/Freeze/dbmap/run.py +++ b/cpp/test/Freeze/dbmap/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp index f6f6bbf8dca..9de65373701 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index d9c30749de6..51e453d9c46 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index 1bd00a6d5ea..b9d8cfdbce5 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice index 2c4e5cf999c..3867a5beea2 100644 --- a/cpp/test/Freeze/evictor/Test.ice +++ b/cpp/test/Freeze/evictor/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp index 2c68325bab2..08fbfdddadd 100644 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ b/cpp/test/Freeze/evictor/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h index b4e4e92e410..02b5cdc05c5 100644 --- a/cpp/test/Freeze/evictor/TestI.h +++ b/cpp/test/Freeze/evictor/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py index 9413699939c..918d826265e 100755 --- a/cpp/test/Freeze/evictor/run.py +++ b/cpp/test/Freeze/evictor/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Glacier/Makefile b/cpp/test/Glacier/Makefile index e64db1a07c3..8961111f655 100644 --- a/cpp/test/Glacier/Makefile +++ b/cpp/test/Glacier/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice index 2069fdaf944..030b528fd85 100644 --- a/cpp/test/Glacier/starter/Callback.ice +++ b/cpp/test/Glacier/starter/Callback.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp index 1999284544f..340da9387a0 100644 --- a/cpp/test/Glacier/starter/CallbackI.cpp +++ b/cpp/test/Glacier/starter/CallbackI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h index 7569c562c73..5c13384cda5 100644 --- a/cpp/test/Glacier/starter/CallbackI.h +++ b/cpp/test/Glacier/starter/CallbackI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp index 46a02bf9487..64d42526f5a 100644 --- a/cpp/test/Glacier/starter/Client.cpp +++ b/cpp/test/Glacier/starter/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile index 0f83dffa360..9e34ee5d62b 100644 --- a/cpp/test/Glacier/starter/Makefile +++ b/cpp/test/Glacier/starter/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp index 7c2721bb5a9..d38af73ceaf 100644 --- a/cpp/test/Glacier/starter/Server.cpp +++ b/cpp/test/Glacier/starter/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py index b55c515a89c..b6c512a23ad 100755 --- a/cpp/test/Glacier/starter/run.py +++ b/cpp/test/Glacier/starter/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index 3de39558320..05d15121a6f 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index e8e7bd87816..c23f0dd90a5 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index a4b8ab472b4..5f5f7753831 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 89c839fffc9..4082a6345bb 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile index 9aec6579f71..4ecdf89225b 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile +++ b/cpp/test/Ice/adapterDeactivation/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index 200bd441672..521d5393583 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -2,9 +2,13 @@ //
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. //
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h index 396d5c6433c..c7a8ccdc528 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h @@ -2,9 +2,13 @@ //
// Copyright (c) 2002
// ZeroC, Inc.
-// Huntsville, AL, USA
+// Billerica, MA, USA
//
-// All Rights Reserved
+// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. //
// **********************************************************************
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index ae48e687027..0cfcbc76920 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice index 0b31204bfac..3e808dba8e7 100644 --- a/cpp/test/Ice/adapterDeactivation/Test.ice +++ b/cpp/test/Ice/adapterDeactivation/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp index 3ccf1d858f5..d09ff7169de 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.cpp +++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h index 354e554d415..cd3103bda47 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.h +++ b/cpp/test/Ice/adapterDeactivation/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py index 9a1a30e7a08..2e8b114c5e1 100755 --- a/cpp/test/Ice/adapterDeactivation/run.py +++ b/cpp/test/Ice/adapterDeactivation/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 900c70b7345..17cc2a75195 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index 6d3bacc060f..db552522ccd 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 1e8a0bee00e..358450f5524 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile index 23977de82fb..9ac36ea1b96 100644 --- a/cpp/test/Ice/exceptions/Makefile +++ b/cpp/test/Ice/exceptions/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 3414fe8ebf5..380ca901e86 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice index 449a222af7b..633836364ad 100644 --- a/cpp/test/Ice/exceptions/Test.ice +++ b/cpp/test/Ice/exceptions/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp index 09880747fa0..96c85dc794c 100644 --- a/cpp/test/Ice/exceptions/TestI.cpp +++ b/cpp/test/Ice/exceptions/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h index 2148a95ceea..675b73cceba 100644 --- a/cpp/test/Ice/exceptions/TestI.h +++ b/cpp/test/Ice/exceptions/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py index d3be9a0920a..0ea4236d31c 100755 --- a/cpp/test/Ice/exceptions/run.py +++ b/cpp/test/Ice/exceptions/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 5d3be706489..11393d05279 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp index 97a62c8c1cb..04bf6870f52 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index c4faed6abb3..9c386743c6f 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile index 23977de82fb..9ac36ea1b96 100644 --- a/cpp/test/Ice/facets/Makefile +++ b/cpp/test/Ice/facets/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index b36b3901716..478f81db8c3 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice index 4bf57f2e425..295646fc009 100644 --- a/cpp/test/Ice/facets/Test.ice +++ b/cpp/test/Ice/facets/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp index adedb593480..124f8dc689c 100644 --- a/cpp/test/Ice/facets/TestI.cpp +++ b/cpp/test/Ice/facets/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h index 80167b7026a..ee5f1de1bc1 100644 --- a/cpp/test/Ice/facets/TestI.h +++ b/cpp/test/Ice/facets/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py index abb272f95dd..59ac0173cc5 100755 --- a/cpp/test/Ice/facets/run.py +++ b/cpp/test/Ice/facets/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index 1758277a116..67f95d25497 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp index 187e829d653..9f6e6729754 100644 --- a/cpp/test/Ice/faultTolerance/Client.cpp +++ b/cpp/test/Ice/faultTolerance/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile index ba63fbee911..6abf6e53374 100644 --- a/cpp/test/Ice/faultTolerance/Makefile +++ b/cpp/test/Ice/faultTolerance/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index 42b98687352..6c08aa25162 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice index ee2b81aa96b..e3d9e9c0fbd 100644 --- a/cpp/test/Ice/faultTolerance/Test.ice +++ b/cpp/test/Ice/faultTolerance/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp index 6cddfa07a43..0829715886d 100644 --- a/cpp/test/Ice/faultTolerance/TestI.cpp +++ b/cpp/test/Ice/faultTolerance/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h index 0a4e1249757..45c4218c853 100644 --- a/cpp/test/Ice/faultTolerance/TestI.h +++ b/cpp/test/Ice/faultTolerance/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 14f5400cff8..64d1f5a596e 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index e4289c16c9b..3c53b464b24 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index b31bb6eaed7..cbeb2e49369 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 5a2d76d1e49..1022ed2237e 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile index 23977de82fb..9ac36ea1b96 100644 --- a/cpp/test/Ice/inheritance/Makefile +++ b/cpp/test/Ice/inheritance/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index eaacdc22639..9bb8a7730e3 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index ab3e1af96b5..444965bbb38 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp index c60eec27dc5..76219ce6fab 100644 --- a/cpp/test/Ice/inheritance/TestI.cpp +++ b/cpp/test/Ice/inheritance/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h index da896de4a64..d755f08cff6 100644 --- a/cpp/test/Ice/inheritance/TestI.h +++ b/cpp/test/Ice/inheritance/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py index d16a62390cd..607e5f5860f 100755 --- a/cpp/test/Ice/inheritance/run.py +++ b/cpp/test/Ice/inheritance/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 6a55e840f61..2a90588a78a 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp index 241ca1a391c..611aa676545 100644 --- a/cpp/test/Ice/location/Client.cpp +++ b/cpp/test/Ice/location/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/Collocated.cpp b/cpp/test/Ice/location/Collocated.cpp index 4174a33b2d9..1b881a89013 100644 --- a/cpp/test/Ice/location/Collocated.cpp +++ b/cpp/test/Ice/location/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile index cd8af562a56..2a43820bacb 100644 --- a/cpp/test/Ice/location/Makefile +++ b/cpp/test/Ice/location/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 361847ad185..c1c226c9642 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp index 4ff7d7280c2..3dbd9d47315 100644 --- a/cpp/test/Ice/location/ServerLocator.cpp +++ b/cpp/test/Ice/location/ServerLocator.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h index 74a5631d0f4..27870d5730c 100644 --- a/cpp/test/Ice/location/ServerLocator.h +++ b/cpp/test/Ice/location/ServerLocator.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice index 33b8214de05..bcc9d789877 100644 --- a/cpp/test/Ice/location/Test.ice +++ b/cpp/test/Ice/location/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 3e550f25295..bd432288d6b 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h index e840d62ce16..95bbc0c0927 100644 --- a/cpp/test/Ice/location/TestI.h +++ b/cpp/test/Ice/location/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py index 4965c43c262..79ebc1fafa9 100755 --- a/cpp/test/Ice/location/run.py +++ b/cpp/test/Ice/location/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/locationForward/AllTests.cpp b/cpp/test/Ice/locationForward/AllTests.cpp index 78216604160..5e3e28a2c15 100644 --- a/cpp/test/Ice/locationForward/AllTests.cpp +++ b/cpp/test/Ice/locationForward/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/Client.cpp b/cpp/test/Ice/locationForward/Client.cpp index 85342ac7957..d75483b04a4 100644 --- a/cpp/test/Ice/locationForward/Client.cpp +++ b/cpp/test/Ice/locationForward/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/Makefile b/cpp/test/Ice/locationForward/Makefile index ba63fbee911..6abf6e53374 100644 --- a/cpp/test/Ice/locationForward/Makefile +++ b/cpp/test/Ice/locationForward/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/locationForward/Server.cpp b/cpp/test/Ice/locationForward/Server.cpp index 0e1f01bf21c..dcafdba2186 100644 --- a/cpp/test/Ice/locationForward/Server.cpp +++ b/cpp/test/Ice/locationForward/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/Test.ice b/cpp/test/Ice/locationForward/Test.ice index 225b9b97776..4cb685b4aa2 100644 --- a/cpp/test/Ice/locationForward/Test.ice +++ b/cpp/test/Ice/locationForward/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/TestI.cpp b/cpp/test/Ice/locationForward/TestI.cpp index 4e4e8391720..a44db53e673 100644 --- a/cpp/test/Ice/locationForward/TestI.cpp +++ b/cpp/test/Ice/locationForward/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/TestI.h b/cpp/test/Ice/locationForward/TestI.h index 8d096c5b82d..64fd2649d6d 100644 --- a/cpp/test/Ice/locationForward/TestI.h +++ b/cpp/test/Ice/locationForward/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py index b2378348bfb..4b35d9b9da1 100755 --- a/cpp/test/Ice/locationForward/run.py +++ b/cpp/test/Ice/locationForward/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index d4b8429d03b..7b57c7664a8 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 04351dc128f..297c370dc97 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 2323207f6c3..d92080f1454 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile index 23977de82fb..9ac36ea1b96 100644 --- a/cpp/test/Ice/objects/Makefile +++ b/cpp/test/Ice/objects/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 88ed0e98d74..5173bbaf340 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index 54a6827cc55..e5c1420fea9 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index c7ea1e13c5b..111017ea381 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index 176305b5fd3..0fd3e49eff9 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py index df5c80dd149..b3049647a9e 100755 --- a/cpp/test/Ice/objects/run.py +++ b/cpp/test/Ice/objects/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp index aaadfbd34f1..e7b782f8158 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index 4cbcb7681e4..8f6b8661e15 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index c5736a6ec12..eaffbfdc8a3 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile index f222d5d24df..22e15cf477d 100644 --- a/cpp/test/Ice/operations/Makefile +++ b/cpp/test/Ice/operations/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 544748e1e4b..d92365e1911 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice index 47a31cb9ce7..e749e3f2d12 100644 --- a/cpp/test/Ice/operations/Test.ice +++ b/cpp/test/Ice/operations/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 97205d8c617..e19b4cde42d 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h index ee51d840ad5..30e7754c166 100644 --- a/cpp/test/Ice/operations/TestI.h +++ b/cpp/test/Ice/operations/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 3b2fe3670ec..a5974fe29a7 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py index 1263c494a8e..010ae0fcc40 100755 --- a/cpp/test/Ice/operations/run.py +++ b/cpp/test/Ice/operations/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/Makefile b/cpp/test/IcePack/Makefile index 4638c51bd3a..c24dddfca31 100644 --- a/cpp/test/IcePack/Makefile +++ b/cpp/test/IcePack/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp index 93fccb76f43..8f1f7c7f847 100644 --- a/cpp/test/IcePack/deployer/AllTests.cpp +++ b/cpp/test/IcePack/deployer/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/Client.cpp b/cpp/test/IcePack/deployer/Client.cpp index 26da21b940e..5e5942c799c 100644 --- a/cpp/test/IcePack/deployer/Client.cpp +++ b/cpp/test/IcePack/deployer/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile index 85628d8b86d..9f6b65668fa 100644 --- a/cpp/test/IcePack/deployer/Makefile +++ b/cpp/test/IcePack/deployer/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/deployer/Server.cpp b/cpp/test/IcePack/deployer/Server.cpp index 56ee98b5804..f51519d49fb 100644 --- a/cpp/test/IcePack/deployer/Server.cpp +++ b/cpp/test/IcePack/deployer/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp index 0f27fe5fb0f..fb17d51747b 100644 --- a/cpp/test/IcePack/deployer/Service.cpp +++ b/cpp/test/IcePack/deployer/Service.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/Test.ice b/cpp/test/IcePack/deployer/Test.ice index d728ac3a4bb..86a03ea7fb4 100644 --- a/cpp/test/IcePack/deployer/Test.ice +++ b/cpp/test/IcePack/deployer/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/TestI.cpp b/cpp/test/IcePack/deployer/TestI.cpp index 22d3c75f155..e2a60e407e4 100644 --- a/cpp/test/IcePack/deployer/TestI.cpp +++ b/cpp/test/IcePack/deployer/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h index ca7d1521629..bebe702fc67 100644 --- a/cpp/test/IcePack/deployer/TestI.h +++ b/cpp/test/IcePack/deployer/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py index b9d660d6c06..d7e73e51228 100755 --- a/cpp/test/IcePack/deployer/run.py +++ b/cpp/test/IcePack/deployer/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp index 059da06b185..03d5cfcdfe7 100644 --- a/cpp/test/IcePack/simple/AllTests.cpp +++ b/cpp/test/IcePack/simple/AllTests.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/Client.cpp b/cpp/test/IcePack/simple/Client.cpp index 9d2b049c7cb..e3698fbd4b0 100644 --- a/cpp/test/IcePack/simple/Client.cpp +++ b/cpp/test/IcePack/simple/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile index 91c89a0d53b..3485ae33193 100644 --- a/cpp/test/IcePack/simple/Makefile +++ b/cpp/test/IcePack/simple/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp index 65d903f3a27..b644019ab6d 100644 --- a/cpp/test/IcePack/simple/Server.cpp +++ b/cpp/test/IcePack/simple/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice index 225b9b97776..4cb685b4aa2 100644 --- a/cpp/test/IcePack/simple/Test.ice +++ b/cpp/test/IcePack/simple/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp index dfcc6c9593d..b07468f09ad 100644 --- a/cpp/test/IcePack/simple/TestI.cpp +++ b/cpp/test/IcePack/simple/TestI.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h index 4f0e4f2205f..00501b38286 100644 --- a/cpp/test/IcePack/simple/TestI.h +++ b/cpp/test/IcePack/simple/TestI.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IcePack/simple/icepackadmin.py b/cpp/test/IcePack/simple/icepackadmin.py index abdc3fe4fea..39c46979e7b 100755 --- a/cpp/test/IcePack/simple/icepackadmin.py +++ b/cpp/test/IcePack/simple/icepackadmin.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py index 837972caf0f..564de204d94 100755 --- a/cpp/test/IcePack/simple/run.py +++ b/cpp/test/IcePack/simple/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile index 148ea7e8276..2a5456b5bd4 100644 --- a/cpp/test/IceSSL/Makefile +++ b/cpp/test/IceSSL/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp index a7962f0737a..142ab493108 100644 --- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp +++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile index bfff0086bdc..a8bf4f2c1cd 100644 --- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile +++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py index 0faed66d0d8..af0805acaab 100755 --- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py +++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp index 32acba9d57e..1901d55d202 100644 --- a/cpp/test/IceSSL/certificateVerification/Client.cpp +++ b/cpp/test/IceSSL/certificateVerification/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile index 81335d690f9..7de2d7e6222 100644 --- a/cpp/test/IceSSL/certificateVerification/Makefile +++ b/cpp/test/IceSSL/certificateVerification/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice index f80457dbb32..6477cea53a3 100644 --- a/cpp/test/IceSSL/certificateVerification/Pinger.ice +++ b/cpp/test/IceSSL/certificateVerification/Pinger.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp index fc54dde50ae..9dce7df74e4 100644 --- a/cpp/test/IceSSL/certificateVerification/Server.cpp +++ b/cpp/test/IceSSL/certificateVerification/Server.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py index cf991a2e309..95f5a4f947b 100755 --- a/cpp/test/IceSSL/certificateVerification/run.py +++ b/cpp/test/IceSSL/certificateVerification/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp index 71d236e33fe..42290079db5 100644 --- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp +++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile index c848c3c4ac7..b41bde55805 100644 --- a/cpp/test/IceSSL/certificateVerifier/Makefile +++ b/cpp/test/IceSSL/certificateVerifier/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py index 13d25b53cf1..340febd22ec 100755 --- a/cpp/test/IceSSL/certificateVerifier/run.py +++ b/cpp/test/IceSSL/certificateVerifier/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp index b060bfb3d95..11101f575bb 100644 --- a/cpp/test/IceSSL/configuration/Configuration.cpp +++ b/cpp/test/IceSSL/configuration/Configuration.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile index 1cadb48728b..de038eb1625 100644 --- a/cpp/test/IceSSL/configuration/Makefile +++ b/cpp/test/IceSSL/configuration/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index e4a855c0d75..f36caeaca66 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp index 29f1c29b4a4..99bf009c339 100644 --- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp +++ b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile index 39c8b3f925e..169b467c227 100644 --- a/cpp/test/IceSSL/loadPEM/Makefile +++ b/cpp/test/IceSSL/loadPEM/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py index 98f6dac4489..27a4a7b05c3 100755 --- a/cpp/test/IceSSL/loadPEM/run.py +++ b/cpp/test/IceSSL/loadPEM/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile index 2344b259d18..f559ca46477 100644 --- a/cpp/test/IceStorm/Makefile +++ b/cpp/test/IceStorm/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice index 8521b2eabec..abee10003cc 100644 --- a/cpp/test/IceStorm/federation/Event.ice +++ b/cpp/test/IceStorm/federation/Event.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 6d51fa81a56..fb445b2fdea 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp index d3765ae4223..46dd1a3b82c 100644 --- a/cpp/test/IceStorm/federation/Publisher.cpp +++ b/cpp/test/IceStorm/federation/Publisher.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp index 4bc9a669db7..92886657f05 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 722635fe54f..8645e19f97c 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 05e94a4209d..29e6b3c7b80 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index 1f3dc9b30b4..c1fa7b4378a 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp index 1f16919d76f..eb3ea47b58d 100644 --- a/cpp/test/IceStorm/single/Publisher.cpp +++ b/cpp/test/IceStorm/single/Publisher.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice index 1f90ac9aa92..24c1caff7b0 100644 --- a/cpp/test/IceStorm/single/Single.ice +++ b/cpp/test/IceStorm/single/Single.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 24693b51b6f..6c5d7cb9cee 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index 5cdeb384b29..5ee98f89d39 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile index b3962d91602..a4446b6550b 100644 --- a/cpp/test/IceUtil/Makefile +++ b/cpp/test/IceUtil/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp index e7317933c84..ecd7caafb7b 100644 --- a/cpp/test/IceUtil/inputUtil/Client.cpp +++ b/cpp/test/IceUtil/inputUtil/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/inputUtil/Makefile b/cpp/test/IceUtil/inputUtil/Makefile index 6594a12ac5c..4aa91ebe331 100644 --- a/cpp/test/IceUtil/inputUtil/Makefile +++ b/cpp/test/IceUtil/inputUtil/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py index 2376fd7797b..1e5cec5c3cd 100755 --- a/cpp/test/IceUtil/inputUtil/run.py +++ b/cpp/test/IceUtil/inputUtil/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp index 795d3a17146..88306dd5e4b 100644 --- a/cpp/test/IceUtil/thread/Client.cpp +++ b/cpp/test/IceUtil/thread/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp index daf15c2ed89..5b42b8f3c1f 100644 --- a/cpp/test/IceUtil/thread/CreateTest.cpp +++ b/cpp/test/IceUtil/thread/CreateTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h index f165ed67c83..4434f27aad4 100644 --- a/cpp/test/IceUtil/thread/CreateTest.h +++ b/cpp/test/IceUtil/thread/CreateTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile index 7edcda68566..ca6a1ea3eb1 100644 --- a/cpp/test/IceUtil/thread/Makefile +++ b/cpp/test/IceUtil/thread/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp index 571004bbad1..e5ee43cca14 100644 --- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h index 619ec7b51dc..0ce7b03b501 100644 --- a/cpp/test/IceUtil/thread/MonitorMutexTest.h +++ b/cpp/test/IceUtil/thread/MonitorMutexTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp index 87a4520a513..4dffa88fcd5 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h index f595403122c..207ab8f7d27 100644 --- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h +++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp index 73ca37d3afd..f41d0f8705a 100644 --- a/cpp/test/IceUtil/thread/MutexTest.cpp +++ b/cpp/test/IceUtil/thread/MutexTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h index 8ba268cb672..5cc0444a98a 100644 --- a/cpp/test/IceUtil/thread/MutexTest.h +++ b/cpp/test/IceUtil/thread/MutexTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp index 020205e2cb9..bebbeeacc48 100644 --- a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.h b/cpp/test/IceUtil/thread/RWRecMutexTest.h index 18153db1792..f312ecad3dd 100644 --- a/cpp/test/IceUtil/thread/RWRecMutexTest.h +++ b/cpp/test/IceUtil/thread/RWRecMutexTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp index 9ef95c506ad..7742466e2bd 100644 --- a/cpp/test/IceUtil/thread/RecMutexTest.cpp +++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h index 92debbfcc94..dbb4c24c8b8 100644 --- a/cpp/test/IceUtil/thread/RecMutexTest.h +++ b/cpp/test/IceUtil/thread/RecMutexTest.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp index cfc559c9d5f..a3f2dcef7fd 100644 --- a/cpp/test/IceUtil/thread/TestBase.cpp +++ b/cpp/test/IceUtil/thread/TestBase.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h index e7fdf894ffe..0dca9d11c74 100644 --- a/cpp/test/IceUtil/thread/TestBase.h +++ b/cpp/test/IceUtil/thread/TestBase.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp index f5a672bd3a3..65eac720422 100644 --- a/cpp/test/IceUtil/thread/TestSuite.cpp +++ b/cpp/test/IceUtil/thread/TestSuite.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h index b0a3c0c5230..71f2d4b9611 100644 --- a/cpp/test/IceUtil/thread/TestSuite.h +++ b/cpp/test/IceUtil/thread/TestSuite.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py index 55556de951f..bfb63383395 100755 --- a/cpp/test/IceUtil/thread/run.py +++ b/cpp/test/IceUtil/thread/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index fc64aa0b517..1987ca44d4a 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile index 6594a12ac5c..4aa91ebe331 100644 --- a/cpp/test/IceUtil/unicode/Makefile +++ b/cpp/test/IceUtil/unicode/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py index a5489c5f06c..852239ea742 100755 --- a/cpp/test/IceUtil/unicode/run.py +++ b/cpp/test/IceUtil/unicode/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceXML/Makefile b/cpp/test/IceXML/Makefile index 2bbde380d3c..b7409d44a79 100644 --- a/cpp/test/IceXML/Makefile +++ b/cpp/test/IceXML/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceXML/encoding/Client.cpp b/cpp/test/IceXML/encoding/Client.cpp index 4bc42dc78a6..30508655d35 100644 --- a/cpp/test/IceXML/encoding/Client.cpp +++ b/cpp/test/IceXML/encoding/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceXML/encoding/Makefile b/cpp/test/IceXML/encoding/Makefile index 72264b184d7..d902fc5978c 100644 --- a/cpp/test/IceXML/encoding/Makefile +++ b/cpp/test/IceXML/encoding/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/IceXML/encoding/Test.ice b/cpp/test/IceXML/encoding/Test.ice index f28e5be0613..81cba53f251 100644 --- a/cpp/test/IceXML/encoding/Test.ice +++ b/cpp/test/IceXML/encoding/Test.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/IceXML/encoding/ice.xsd b/cpp/test/IceXML/encoding/ice.xsd index 3acf47f9085..05de9d19b80 100644 --- a/cpp/test/IceXML/encoding/ice.xsd +++ b/cpp/test/IceXML/encoding/ice.xsd @@ -3,7 +3,7 @@ ********************************************************************** Copyright (c) 2001 ZeroC, Inc. -Huntsville, AL, USA +Billerica, MA, USA All Rights Reserved ********************************************************************** diff --git a/cpp/test/IceXML/encoding/run.py b/cpp/test/IceXML/encoding/run.py index 6aa3125b680..c83adbc7958 100755 --- a/cpp/test/IceXML/encoding/run.py +++ b/cpp/test/IceXML/encoding/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 3e4705ce999..7b9c7691698 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.err b/cpp/test/Slice/errorDetection/CaseInsensitive.err index fa6deca7247..b833324ea8f 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.err +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.err @@ -1,73 +1,73 @@ -CaseInsensitive.ice:13: redefinition of operation `op' as operation `op' -CaseInsensitive.ice:18: operation `oP' differs only in capitalization from operation `op' -CaseInsensitive.ice:18: redefinition of operation `op' as operation `oP' -CaseInsensitive.ice:23: redefinition of data member `l' as operation `l' -CaseInsensitive.ice:28: operation `L' differs only in capitalization from data member `l' -CaseInsensitive.ice:28: redefinition of data member `l' as operation `L' -CaseInsensitive.ice:33: module `M1' is capitalized inconsistently with its previous name: `m1' -CaseInsensitive.ice:33: `M1' has changed meaning -CaseInsensitive.ice:34: redefinition of class `c1' as module -CaseInsensitive.ice:35: module `C1' differs only in capitalization from class name `c1' -CaseInsensitive.ice:35: `C1' has changed meaning -CaseInsensitive.ice:38: redefinition of parameter `aa' -CaseInsensitive.ice:39: parameter `BB' differs only in capitalization from parameter `bb' -CaseInsensitive.ice:39: `BB' has changed meaning -CaseInsensitive.ice:43: operation `I4' differs only in capitalization from enclosing interface name `i4' -CaseInsensitive.ice:47: interface name `i5' cannot be used as operation name -CaseInsensitive.ice:55: operation `op' is already defined as an operation in a base interface or class -CaseInsensitive.ice:59: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class -CaseInsensitive.ice:67: operation `l' is already defined as a data member in a base interface or class -CaseInsensitive.ice:71: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class -CaseInsensitive.ice:76: operation `L' differs only in capitalization from data member `l' -CaseInsensitive.ice:76: redefinition of data member `l' as operation `L' -CaseInsensitive.ice:80: data member `l' is already defined as a data member in a base interface or class -CaseInsensitive.ice:84: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class -CaseInsensitive.ice:89: data member `l' differs only in capitalization from operation `L' -CaseInsensitive.ice:89: `l' has changed meaning -CaseInsensitive.ice:94: redefinition of exception member `l' -CaseInsensitive.ice:99: exception member `L' differs only in capitalization from exception member `l' -CaseInsensitive.ice:99: `L' has changed meaning -CaseInsensitive.ice:103: exception name `e3' cannot be used as exception member name -CaseInsensitive.ice:107: exception member `E4' differs only in capitalization from enclosing exception name `e4' -CaseInsensitive.ice:115: exception member `l' is already defined in a base exception -CaseInsensitive.ice:119: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception -CaseInsensitive.ice:124: redefinition of struct member `l' -CaseInsensitive.ice:129: member `L' differs only in capitalization from member `l' -CaseInsensitive.ice:129: `L' has changed meaning -CaseInsensitive.ice:133: struct name `s3' cannot be used as member name -CaseInsensitive.ice:138: struct member `S4' differs only in capitalization from enclosing struct name `s4' -CaseInsensitive.ice:143: sequence `LS' differs only in capitalization from sequence `ls' -CaseInsensitive.ice:144: redefinition of module `m1' as sequence -CaseInsensitive.ice:145: sequence `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:148: dictionary `D' differs only in capitalization from dictionary `d' -CaseInsensitive.ice:149: redefinition of module `m1' as dictionary -CaseInsensitive.ice:150: dictionary `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:153: enumeration `eN1' differs only in capitalization from enumeration `en1' -CaseInsensitive.ice:153: `eN1' has changed meaning -CaseInsensitive.ice:154: redefinition of module `m1' as enumeration -CaseInsensitive.ice:155: enumeration `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:155: `M1' has changed meaning -CaseInsensitive.ice:157: redefinition of enumeration `en1' as enumerator -CaseInsensitive.ice:158: enumerator `EN1' differs only in capitalization from enumeration `en1' -CaseInsensitive.ice:159: redefinition of module `m1' as enumerator -CaseInsensitive.ice:160: enumerator `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:172: interface name `base' is capitalized inconsistently with its previous name: `::xxx::xx::Base' -CaseInsensitive.ice:172: redefinition of interface `Derived' -CaseInsensitive.ice:176: exception name `E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:180: sequence name `S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:181: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:182: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:183: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:188: interface name `derived' is capitalized inconsistently with its previous name: `::xxx::xx::Derived' -CaseInsensitive.ice:196: parameter `Param' differs only in capitalization from parameter `param' -CaseInsensitive.ice:196: `Param' has changed meaning -CaseInsensitive.ice:198: exception name `E1' is capitalized inconsistently with its previous name: `::e1' -CaseInsensitive.ice:200: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:201: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:202: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:17: redefinition of operation `op' as operation `op' +CaseInsensitive.ice:22: operation `oP' differs only in capitalization from operation `op' +CaseInsensitive.ice:22: redefinition of operation `op' as operation `oP' +CaseInsensitive.ice:27: redefinition of data member `l' as operation `l' +CaseInsensitive.ice:32: operation `L' differs only in capitalization from data member `l' +CaseInsensitive.ice:32: redefinition of data member `l' as operation `L' +CaseInsensitive.ice:37: module `M1' is capitalized inconsistently with its previous name: `m1' +CaseInsensitive.ice:37: `M1' has changed meaning +CaseInsensitive.ice:38: redefinition of class `c1' as module +CaseInsensitive.ice:39: module `C1' differs only in capitalization from class name `c1' +CaseInsensitive.ice:39: `C1' has changed meaning +CaseInsensitive.ice:42: redefinition of parameter `aa' +CaseInsensitive.ice:43: parameter `BB' differs only in capitalization from parameter `bb' +CaseInsensitive.ice:43: `BB' has changed meaning +CaseInsensitive.ice:47: operation `I4' differs only in capitalization from enclosing interface name `i4' +CaseInsensitive.ice:51: interface name `i5' cannot be used as operation name +CaseInsensitive.ice:59: operation `op' is already defined as an operation in a base interface or class +CaseInsensitive.ice:63: operation `OP' differs only in capitalization from operation `op', which is defined in a base interface or class +CaseInsensitive.ice:71: operation `l' is already defined as a data member in a base interface or class +CaseInsensitive.ice:75: operation `L' differs only in capitalization from data member `l', which is defined in a base interface or class +CaseInsensitive.ice:80: operation `L' differs only in capitalization from data member `l' +CaseInsensitive.ice:80: redefinition of data member `l' as operation `L' +CaseInsensitive.ice:84: data member `l' is already defined as a data member in a base interface or class +CaseInsensitive.ice:88: data member `L' differs only in capitalization from data member `l', which is defined in a base interface or class +CaseInsensitive.ice:93: data member `l' differs only in capitalization from operation `L' +CaseInsensitive.ice:93: `l' has changed meaning +CaseInsensitive.ice:98: redefinition of exception member `l' +CaseInsensitive.ice:103: exception member `L' differs only in capitalization from exception member `l' +CaseInsensitive.ice:103: `L' has changed meaning +CaseInsensitive.ice:107: exception name `e3' cannot be used as exception member name +CaseInsensitive.ice:111: exception member `E4' differs only in capitalization from enclosing exception name `e4' +CaseInsensitive.ice:119: exception member `l' is already defined in a base exception +CaseInsensitive.ice:123: exception member `L' differs only in capitalization from exception member `l', which is defined in a base exception +CaseInsensitive.ice:128: redefinition of struct member `l' +CaseInsensitive.ice:133: member `L' differs only in capitalization from member `l' +CaseInsensitive.ice:133: `L' has changed meaning +CaseInsensitive.ice:137: struct name `s3' cannot be used as member name +CaseInsensitive.ice:142: struct member `S4' differs only in capitalization from enclosing struct name `s4' +CaseInsensitive.ice:147: sequence `LS' differs only in capitalization from sequence `ls' +CaseInsensitive.ice:148: redefinition of module `m1' as sequence +CaseInsensitive.ice:149: sequence `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:152: dictionary `D' differs only in capitalization from dictionary `d' +CaseInsensitive.ice:153: redefinition of module `m1' as dictionary +CaseInsensitive.ice:154: dictionary `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:157: enumeration `eN1' differs only in capitalization from enumeration `en1' +CaseInsensitive.ice:157: `eN1' has changed meaning +CaseInsensitive.ice:158: redefinition of module `m1' as enumeration +CaseInsensitive.ice:159: enumeration `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:159: `M1' has changed meaning +CaseInsensitive.ice:161: redefinition of enumeration `en1' as enumerator +CaseInsensitive.ice:162: enumerator `EN1' differs only in capitalization from enumeration `en1' +CaseInsensitive.ice:163: redefinition of module `m1' as enumerator +CaseInsensitive.ice:164: enumerator `M1' differs only in capitalization from module `m1' +CaseInsensitive.ice:176: interface name `base' is capitalized inconsistently with its previous name: `::xxx::xx::Base' +CaseInsensitive.ice:176: redefinition of interface `Derived' +CaseInsensitive.ice:180: exception name `E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:184: sequence name `S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' +CaseInsensitive.ice:185: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' +CaseInsensitive.ice:186: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' +CaseInsensitive.ice:187: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' +CaseInsensitive.ice:192: interface name `derived' is capitalized inconsistently with its previous name: `::xxx::xx::Derived' +CaseInsensitive.ice:200: parameter `Param' differs only in capitalization from parameter `param' +CaseInsensitive.ice:200: `Param' has changed meaning +CaseInsensitive.ice:202: exception name `E1' is capitalized inconsistently with its previous name: `::e1' CaseInsensitive.ice:204: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' CaseInsensitive.ice:205: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' CaseInsensitive.ice:206: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:207: operation name `op12' cannot be used as parameter name -CaseInsensitive.ice:208: parameter `OP13' differs only in capitalization from operation name `op13' -CaseInsensitive.ice:221: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces +CaseInsensitive.ice:208: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:209: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:210: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:211: operation name `op12' cannot be used as parameter name +CaseInsensitive.ice:212: parameter `OP13' differs only in capitalization from operation name `op13' +CaseInsensitive.ice:225: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice index 2118d2b9c7a..f7afc3c4bdb 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.err b/cpp/test/Slice/errorDetection/CaseSensitive.err index 883a78999f8..061df53b85a 100644 --- a/cpp/test/Slice/errorDetection/CaseSensitive.err +++ b/cpp/test/Slice/errorDetection/CaseSensitive.err @@ -1,3 +1,3 @@ -CaseSensitive.ice:16: redefinition of struct `m2' as class -CaseSensitive.ice:58: `I8' is not defined -CaseSensitive.ice:64: `I10' is not defined +CaseSensitive.ice:30: redefinition of struct `m2' as class +CaseSensitive.ice:72: `I8' is not defined +CaseSensitive.ice:78: `I10' is not defined diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice index c729fdf88d4..bda6788ce6b 100644 --- a/cpp/test/Slice/errorDetection/CaseSensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + module M1 { }; diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.err b/cpp/test/Slice/errorDetection/ChangedMeaning.err index fd5c731535f..2f5e57ccdc9 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.err +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.err @@ -1,16 +1,16 @@ -ChangedMeaning.ice:5: `ls' has changed meaning -ChangedMeaning.ice:16: `ls' has changed meaning -ChangedMeaning.ice:35: `M' has changed meaning -ChangedMeaning.ice:41: `M' has changed meaning -ChangedMeaning.ice:48: `i1' has changed meaning -ChangedMeaning.ice:49: `i2' has changed meaning -ChangedMeaning.ice:70: `e1' has changed meaning -ChangedMeaning.ice:71: `e2' has changed meaning -ChangedMeaning.ice:83: `c1' has changed meaning -ChangedMeaning.ice:84: `c2' has changed meaning -ChangedMeaning.ice:95: `blue' has changed meaning -ChangedMeaning.ice:105: `CounterSeq' has changed meaning -ChangedMeaning.ice:112: `counter' has changed meaning -ChangedMeaning.ice:113: `counter' is not a type -ChangedMeaning.ice:114: redefinition of parameter `param' -ChangedMeaning.ice:120: `is' has changed meaning +ChangedMeaning.ice:19: `ls' has changed meaning +ChangedMeaning.ice:30: `ls' has changed meaning +ChangedMeaning.ice:49: `M' has changed meaning +ChangedMeaning.ice:55: `M' has changed meaning +ChangedMeaning.ice:62: `i1' has changed meaning +ChangedMeaning.ice:63: `i2' has changed meaning +ChangedMeaning.ice:84: `e1' has changed meaning +ChangedMeaning.ice:85: `e2' has changed meaning +ChangedMeaning.ice:97: `c1' has changed meaning +ChangedMeaning.ice:98: `c2' has changed meaning +ChangedMeaning.ice:109: `blue' has changed meaning +ChangedMeaning.ice:119: `CounterSeq' has changed meaning +ChangedMeaning.ice:126: `counter' has changed meaning +ChangedMeaning.ice:127: `counter' is not a type +ChangedMeaning.ice:128: redefinition of parameter `param' +ChangedMeaning.ice:134: `is' has changed meaning diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice index 7a19a29c6c3..41e5fc84169 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + sequence<long> ls; struct s00 diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.err b/cpp/test/Slice/errorDetection/ClassRedefinition.err index c46657dd95f..344d9e96520 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.err +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.err @@ -1,4 +1,4 @@ -ClassRedefinition.ice:13: redefinition of class `Class1' -ClassRedefinition.ice:13: parse error -ClassRedefinition.ice:17: redefinition of class `Class2' +ClassRedefinition.ice:17: redefinition of class `Class1' ClassRedefinition.ice:17: parse error +ClassRedefinition.ice:21: redefinition of class `Class2' +ClassRedefinition.ice:21: parse error diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice index 075517e4a8d..368cdc2fad0 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err index 4b0d2b6733a..20a82b3dec4 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.err +++ b/cpp/test/Slice/errorDetection/ConstDef.err @@ -1,21 +1,21 @@ -ConstDef.ice:37: `XXX' is not defined -ConstDef.ice:38: redefinition of constant `f11' as constant -ConstDef.ice:39: constant `F10' differs only in capitalization from constant `f10' -ConstDef.ice:42: constant `ic2' has illegal type -ConstDef.ice:43: constant `ic3' has illegal type: `Object' -ConstDef.ice:45: initializer of type `long' is incompatible with the type `bool' of constant `ic4' -ConstDef.ice:46: initializer of type `string' is incompatible with the type `byte' of constant `ic5' -ConstDef.ice:47: initializer of type `double' is incompatible with the type `short' of constant `ic6' -ConstDef.ice:48: type of initializer is incompatible with the type `int' of constant `ic7' -ConstDef.ice:49: initializer of type `bool' is incompatible with the type `long' of constant `ic8' -ConstDef.ice:51: missing constant name -ConstDef.ice:54: enumerator `two' is not defined in enumeration `::color' -ConstDef.ice:55: type of initializer is incompatible with the type of constant `ic10' -ConstDef.ice:71: integer constant `-9223372036854775809' out of range -ConstDef.ice:72: integer constant `+9223372036854775808' out of range -ConstDef.ice:76: initializer `-2147483649' for constant `i3' out of range for type int -ConstDef.ice:77: initializer `2147483648' for constant `i4' out of range for type int -ConstDef.ice:81: initializer `-32769' for constant `s3' out of range for type short -ConstDef.ice:82: initializer `32768' for constant `s4' out of range for type short -ConstDef.ice:86: initializer `-1' for constant `b3' out of range for type byte -ConstDef.ice:87: initializer `256' for constant `b4' out of range for type byte +ConstDef.ice:51: `XXX' is not defined +ConstDef.ice:52: redefinition of constant `f11' as constant +ConstDef.ice:53: constant `F10' differs only in capitalization from constant `f10' +ConstDef.ice:56: constant `ic2' has illegal type +ConstDef.ice:57: constant `ic3' has illegal type: `Object' +ConstDef.ice:59: initializer of type `long' is incompatible with the type `bool' of constant `ic4' +ConstDef.ice:60: initializer of type `string' is incompatible with the type `byte' of constant `ic5' +ConstDef.ice:61: initializer of type `double' is incompatible with the type `short' of constant `ic6' +ConstDef.ice:62: type of initializer is incompatible with the type `int' of constant `ic7' +ConstDef.ice:63: initializer of type `bool' is incompatible with the type `long' of constant `ic8' +ConstDef.ice:65: missing constant name +ConstDef.ice:68: enumerator `two' is not defined in enumeration `::color' +ConstDef.ice:69: type of initializer is incompatible with the type of constant `ic10' +ConstDef.ice:85: integer constant `-9223372036854775809' out of range +ConstDef.ice:86: integer constant `+9223372036854775808' out of range +ConstDef.ice:90: initializer `-2147483649' for constant `i3' out of range for type int +ConstDef.ice:91: initializer `2147483648' for constant `i4' out of range for type int +ConstDef.ice:95: initializer `-32769' for constant `s3' out of range for type short +ConstDef.ice:96: initializer `32768' for constant `s4' out of range for type short +ConstDef.ice:100: initializer `-1' for constant `b3' out of range for type byte +ConstDef.ice:101: initializer `256' for constant `b4' out of range for type byte diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice index 164b60032a6..8714aa1c8fa 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.ice +++ b/cpp/test/Slice/errorDetection/ConstDef.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + // // Basic checks (all OK) // diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err index c5124508493..75297e9fc3e 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.err +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.err @@ -1 +1 @@ -DataMemberRedefinition.ice:14: redefinition of data member `member' as data member `member' +DataMemberRedefinition.ice:18: redefinition of data member `member' as data member `member' diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice index 17212833c32..123afce2935 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.err b/cpp/test/Slice/errorDetection/DeclaratorMissing.err index cdc6cbf0457..070ea115152 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.err +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.err @@ -1,4 +1,4 @@ -DeclaratorMissing.ice:13: missing parameter name -DeclaratorMissing.ice:13: missing parameter name -DeclaratorMissing.ice:14: missing parameter name -DeclaratorMissing.ice:14: missing parameter name +DeclaratorMissing.ice:17: missing parameter name +DeclaratorMissing.ice:17: missing parameter name +DeclaratorMissing.ice:18: missing parameter name +DeclaratorMissing.ice:18: missing parameter name diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice index 84b2c082723..982fc2d0e6d 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.err b/cpp/test/Slice/errorDetection/DerivedRedefinition.err index 3d0e0e7d1d4..74b41401a20 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.err +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.err @@ -1,6 +1,6 @@ -DerivedRedefinition.ice:17: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:18: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:31: operation `op' is already defined as an operation in a base interface or class -DerivedRedefinition.ice:34: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces -DerivedRedefinition.ice:39: data member `l' is already defined as a data member in a base interface or class -DerivedRedefinition.ice:41: data member `l' is already defined as a data member in a base interface or class +DerivedRedefinition.ice:21: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:22: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:35: operation `op' is already defined as an operation in a base interface or class +DerivedRedefinition.ice:38: ambiguous multiple inheritance: `D3' inherits operation `op' from two or more unrelated base interfaces +DerivedRedefinition.ice:43: data member `l' is already defined as a data member in a base interface or class +DerivedRedefinition.ice:45: data member `l' is already defined as a data member in a base interface or class diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice index e145b538aab..78dbcc40d22 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err index ac8336d6570..cdf3844e1f4 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err @@ -1,6 +1,6 @@ -DictionaryRedefinition.ice:11: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization -DictionaryRedefinition.ice:11: keyword `dictionary' cannot be used as dictionary name -DictionaryRedefinition.ice:12: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization -DictionaryRedefinition.ice:12: redefinition of dictionary `dictionary' as dictionary -DictionaryRedefinition.ice:12: keyword `dictionary' cannot be used as dictionary name -DictionaryRedefinition.ice:14: redefinition of dictionary `foo' as dictionary +DictionaryRedefinition.ice:15: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization +DictionaryRedefinition.ice:15: keyword `dictionary' cannot be used as dictionary name +DictionaryRedefinition.ice:16: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization +DictionaryRedefinition.ice:16: redefinition of dictionary `dictionary' as dictionary +DictionaryRedefinition.ice:16: keyword `dictionary' cannot be used as dictionary name +DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index d4a9848d52f..137ac4f3b13 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.err b/cpp/test/Slice/errorDetection/DuplicateParameter.err index 0ab34a11c0c..2266a397688 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.err +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.err @@ -1,8 +1,8 @@ -DuplicateParameter.ice:14: redefinition of parameter `s' -DuplicateParameter.ice:15: redefinition of parameter `s' -DuplicateParameter.ice:16: redefinition of parameter `s' -DuplicateParameter.ice:17: redefinition of parameter `i' -DuplicateParameter.ice:23: redefinition of parameter `s' -DuplicateParameter.ice:24: redefinition of parameter `s' -DuplicateParameter.ice:25: redefinition of parameter `s' -DuplicateParameter.ice:26: redefinition of parameter `i' +DuplicateParameter.ice:18: redefinition of parameter `s' +DuplicateParameter.ice:19: redefinition of parameter `s' +DuplicateParameter.ice:20: redefinition of parameter `s' +DuplicateParameter.ice:21: redefinition of parameter `i' +DuplicateParameter.ice:27: redefinition of parameter `s' +DuplicateParameter.ice:28: redefinition of parameter `s' +DuplicateParameter.ice:29: redefinition of parameter `s' +DuplicateParameter.ice:30: redefinition of parameter `i' diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice index b717e53cdca..83fcb0e211e 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.err b/cpp/test/Slice/errorDetection/DuplicateThrows.err index 1d9cef48b29..4fd4aac496d 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.err +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.err @@ -1,4 +1,4 @@ -DuplicateThrows.ice:3: operation `op' has a throws clause with a duplicate exception: `e' -DuplicateThrows.ice:4: operation `op' has a throws clause with a duplicate exception: `e' -DuplicateThrows.ice:5: operation `op' has a throws clause with a duplicate exception: `e2' -DuplicateThrows.ice:6: operation `op' has a throws clause with duplicate exceptions: `e', `e2' +DuplicateThrows.ice:17: operation `op' has a throws clause with a duplicate exception: `e' +DuplicateThrows.ice:18: operation `op' has a throws clause with a duplicate exception: `e' +DuplicateThrows.ice:19: operation `op' has a throws clause with a duplicate exception: `e2' +DuplicateThrows.ice:20: operation `op' has a throws clause with duplicate exceptions: `e', `e2' diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice index 536899593f5..3b786cb18e1 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + exception e {}; exception e2 {}; interface i2 { void op() throws ::e, e; }; diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.err b/cpp/test/Slice/errorDetection/EnumEmpty.err index fb3d5e71a9d..47010df6239 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.err +++ b/cpp/test/Slice/errorDetection/EnumEmpty.err @@ -1 +1 @@ -EnumEmpty.ice:1: enum `foo' must have at least one enumerator +EnumEmpty.ice:15: enum `foo' must have at least one enumerator diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice index ff174a2db4a..2760193630b 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.ice +++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice @@ -1 +1,15 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + enum foo {}; diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.err b/cpp/test/Slice/errorDetection/EnumRedefinition.err index 4cea5b2085a..fac12aa205c 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.err +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.err @@ -1 +1 @@ -EnumRedefinition.ice:12: redefinition of enumeration `E1' as enumeration +EnumRedefinition.ice:16: redefinition of enumeration `E1' as enumeration diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice index acf245e631d..a6a38d102aa 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err index 30c8a829617..d391d9c7784 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.err @@ -1,2 +1,2 @@ -EnumeratorRedefinition.ice:12: redefinition of enumerator `A' as enumerator -EnumeratorRedefinition.ice:12: redefinition of enumerator `B' as enumerator +EnumeratorRedefinition.ice:16: redefinition of enumerator `A' as enumerator +EnumeratorRedefinition.ice:16: redefinition of enumerator `B' as enumerator diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice index 1a143d7e4b3..30ef18be0b0 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err index 002b967aefc..e27c35eb307 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err @@ -1,92 +1,92 @@ -IdentAsKeyword.ice:11: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization -IdentAsKeyword.ice:13: illegal identifier: `Void' differs from keyword `void' only in capitalization -IdentAsKeyword.ice:13: keyword `void' cannot be used as exception name -IdentAsKeyword.ice:14: keyword `int' cannot be used as exception name -IdentAsKeyword.ice:16: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeyword.ice:16: keyword `out' cannot be used as struct name -IdentAsKeyword.ice:17: keyword `double' cannot be used as struct name -IdentAsKeyword.ice:19: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeyword.ice:19: keyword `int' cannot be used as data member name -IdentAsKeyword.ice:20: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:21: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeyword.ice:21: keyword `int' cannot be used as data member name -IdentAsKeyword.ice:22: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:24: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization -IdentAsKeyword.ice:24: keyword `interface' cannot be used as class name -IdentAsKeyword.ice:25: keyword `interface' cannot be used as class name -IdentAsKeyword.ice:27: illegal identifier: `MOdule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:27: keyword `module' cannot be used as class name -IdentAsKeyword.ice:28: keyword `module' cannot be used as class name -IdentAsKeyword.ice:28: redefinition of class `module' -IdentAsKeyword.ice:28: parse error -IdentAsKeyword.ice:30: illegal identifier: `extendS' differs from keyword `extends' only in capitalization -IdentAsKeyword.ice:30: keyword `extends' cannot be used as data member name -IdentAsKeyword.ice:31: redefinition of class `C' -IdentAsKeyword.ice:31: parse error -IdentAsKeyword.ice:32: keyword `extends' cannot be used as data member name -IdentAsKeyword.ice:34: keyword `local' cannot be used as interface name -IdentAsKeyword.ice:35: illegal identifier: `Local' differs from keyword `local' only in capitalization -IdentAsKeyword.ice:35: keyword `local' cannot be used as interface name -IdentAsKeyword.ice:37: keyword `Object' cannot be used as interface name -IdentAsKeyword.ice:38: illegal identifier: `object' differs from keyword `Object' only in capitalization -IdentAsKeyword.ice:38: keyword `Object' cannot be used as interface name -IdentAsKeyword.ice:38: redefinition of interface `Object' -IdentAsKeyword.ice:38: parse error -IdentAsKeyword.ice:39: keyword `long' cannot be used as interface name -IdentAsKeyword.ice:41: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization -IdentAsKeyword.ice:41: keyword `implements' cannot be used as sequence name -IdentAsKeyword.ice:42: redefinition of sequence `implements' as sequence -IdentAsKeyword.ice:42: keyword `implements' cannot be used as sequence name -IdentAsKeyword.ice:43: keyword `short' cannot be used as sequence name -IdentAsKeyword.ice:45: parse error -IdentAsKeyword.ice:46: illegal identifier: `moDule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:46: parse error -IdentAsKeyword.ice:48: keyword `throws' cannot be used as dictionary name -IdentAsKeyword.ice:49: illegal identifier: `thRows' differs from keyword `throws' only in capitalization -IdentAsKeyword.ice:49: redefinition of dictionary `throws' as dictionary -IdentAsKeyword.ice:49: keyword `throws' cannot be used as dictionary name -IdentAsKeyword.ice:50: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization -IdentAsKeyword.ice:50: keyword `LocalObject' cannot be used as dictionary name -IdentAsKeyword.ice:52: parse error -IdentAsKeyword.ice:53: illegal identifier: `MODULE' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:53: parse error -IdentAsKeyword.ice:55: parse error -IdentAsKeyword.ice:56: illegal identifier: `OUT' differs from keyword `out' only in capitalization +IdentAsKeyword.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization +IdentAsKeyword.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization +IdentAsKeyword.ice:17: keyword `void' cannot be used as exception name +IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name +IdentAsKeyword.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization +IdentAsKeyword.ice:20: keyword `out' cannot be used as struct name +IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name +IdentAsKeyword.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization +IdentAsKeyword.ice:23: keyword `int' cannot be used as data member name +IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name +IdentAsKeyword.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization +IdentAsKeyword.ice:25: keyword `int' cannot be used as data member name +IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name +IdentAsKeyword.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization +IdentAsKeyword.ice:28: keyword `interface' cannot be used as class name +IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name +IdentAsKeyword.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization +IdentAsKeyword.ice:31: keyword `module' cannot be used as class name +IdentAsKeyword.ice:32: keyword `module' cannot be used as class name +IdentAsKeyword.ice:32: redefinition of class `module' +IdentAsKeyword.ice:32: parse error +IdentAsKeyword.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization +IdentAsKeyword.ice:34: keyword `extends' cannot be used as data member name +IdentAsKeyword.ice:35: redefinition of class `C' +IdentAsKeyword.ice:35: parse error +IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name +IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name +IdentAsKeyword.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization +IdentAsKeyword.ice:39: keyword `local' cannot be used as interface name +IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name +IdentAsKeyword.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization +IdentAsKeyword.ice:42: keyword `Object' cannot be used as interface name +IdentAsKeyword.ice:42: redefinition of interface `Object' +IdentAsKeyword.ice:42: parse error +IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name +IdentAsKeyword.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization +IdentAsKeyword.ice:45: keyword `implements' cannot be used as sequence name +IdentAsKeyword.ice:46: redefinition of sequence `implements' as sequence +IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name +IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name +IdentAsKeyword.ice:49: parse error +IdentAsKeyword.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization +IdentAsKeyword.ice:50: parse error +IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name +IdentAsKeyword.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization +IdentAsKeyword.ice:53: redefinition of dictionary `throws' as dictionary +IdentAsKeyword.ice:53: keyword `throws' cannot be used as dictionary name +IdentAsKeyword.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization +IdentAsKeyword.ice:54: keyword `LocalObject' cannot be used as dictionary name IdentAsKeyword.ice:56: parse error -IdentAsKeyword.ice:58: parse error -IdentAsKeyword.ice:59: illegal identifier: `VOID' differs from keyword `void' only in capitalization +IdentAsKeyword.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization +IdentAsKeyword.ice:57: parse error IdentAsKeyword.ice:59: parse error -IdentAsKeyword.ice:59: illegal identifier: `VOID' differs from keyword `void' only in capitalization -IdentAsKeyword.ice:61: keyword `local' cannot be used as enumeration name -IdentAsKeyword.ice:61: redefinition of interface `local' as enumeration -IdentAsKeyword.ice:62: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization -IdentAsKeyword.ice:62: keyword `local' cannot be used as enumeration name -IdentAsKeyword.ice:62: redefinition of interface `local' as enumeration -IdentAsKeyword.ice:62: enumerator `c' differs only in capitalization from class `C' -IdentAsKeyword.ice:64: keyword `long' cannot be used as enumerator -IdentAsKeyword.ice:64: keyword `byte' cannot be used as enumerator -IdentAsKeyword.ice:65: illegal identifier: `LONG' differs from keyword `long' only in capitalization -IdentAsKeyword.ice:65: keyword `long' cannot be used as enumerator -IdentAsKeyword.ice:65: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeyword.ice:65: keyword `byte' cannot be used as enumerator -IdentAsKeyword.ice:67: keyword `module' cannot be used as operation name -IdentAsKeyword.ice:68: illegal identifier: `mODule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:68: keyword `module' cannot be used as operation name -IdentAsKeyword.ice:70: keyword `exception' cannot be used as operation name -IdentAsKeyword.ice:71: illegal identifier: `EXception' differs from keyword `exception' only in capitalization -IdentAsKeyword.ice:71: keyword `exception' cannot be used as operation name -IdentAsKeyword.ice:73: parse error -IdentAsKeyword.ice:74: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeyword.ice:74: parse error -IdentAsKeyword.ice:76: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:77: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeyword.ice:77: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:79: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:80: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization +IdentAsKeyword.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization +IdentAsKeyword.ice:60: parse error +IdentAsKeyword.ice:62: parse error +IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization +IdentAsKeyword.ice:63: parse error +IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization +IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name +IdentAsKeyword.ice:65: redefinition of interface `local' as enumeration +IdentAsKeyword.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization +IdentAsKeyword.ice:66: keyword `local' cannot be used as enumeration name +IdentAsKeyword.ice:66: redefinition of interface `local' as enumeration +IdentAsKeyword.ice:66: enumerator `c' differs only in capitalization from class `C' +IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator +IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator +IdentAsKeyword.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization +IdentAsKeyword.ice:69: keyword `long' cannot be used as enumerator +IdentAsKeyword.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization +IdentAsKeyword.ice:69: keyword `byte' cannot be used as enumerator +IdentAsKeyword.ice:71: keyword `module' cannot be used as operation name +IdentAsKeyword.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization +IdentAsKeyword.ice:72: keyword `module' cannot be used as operation name +IdentAsKeyword.ice:74: keyword `exception' cannot be used as operation name +IdentAsKeyword.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization +IdentAsKeyword.ice:75: keyword `exception' cannot be used as operation name +IdentAsKeyword.ice:77: parse error +IdentAsKeyword.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization +IdentAsKeyword.ice:78: parse error IdentAsKeyword.ice:80: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:84: warning: illegal underscore in identifier `_a' -IdentAsKeyword.ice:85: warning: illegal underscore in identifier `_true' -IdentAsKeyword.ice:86: warning: illegal underscore in identifier `_true' -IdentAsKeyword.ice:88: warning: illegal underscore in identifier `b_' -IdentAsKeyword.ice:89: warning: illegal underscore in identifier `tr_ue' -IdentAsKeyword.ice:90: warning: illegal underscore in identifier `tr_ue' +IdentAsKeyword.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization +IdentAsKeyword.ice:81: keyword `byte' cannot be used as parameter name +IdentAsKeyword.ice:83: keyword `byte' cannot be used as parameter name +IdentAsKeyword.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization +IdentAsKeyword.ice:84: keyword `byte' cannot be used as parameter name +IdentAsKeyword.ice:88: warning: illegal underscore in identifier `_a' +IdentAsKeyword.ice:89: warning: illegal underscore in identifier `_true' +IdentAsKeyword.ice:90: warning: illegal underscore in identifier `_true' +IdentAsKeyword.ice:92: warning: illegal underscore in identifier `b_' +IdentAsKeyword.ice:93: warning: illegal underscore in identifier `tr_ue' +IdentAsKeyword.ice:94: warning: illegal underscore in identifier `tr_ue' diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice index 269476ecfa4..0a6880e4578 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.err b/cpp/test/Slice/errorDetection/IllegalDeclaration.err index 216543463a1..ef7539242c7 100644 --- a/cpp/test/Slice/errorDetection/IllegalDeclaration.err +++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.err @@ -1,2 +1,2 @@ -IllegalDeclaration.ice:11: exceptions cannot be forward declared -IllegalDeclaration.ice:12: structs cannot be forward declared +IllegalDeclaration.ice:15: exceptions cannot be forward declared +IllegalDeclaration.ice:16: structs cannot be forward declared diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice index f0345b51f60..9ed42c6472b 100644 --- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice +++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.err b/cpp/test/Slice/errorDetection/IllegalDictionary.err index e58062a7bac..5f43c053467 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.err +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.err @@ -1,9 +1,9 @@ -IllegalDictionary.ice:8: dictionary `b1' uses an illegal key type -IllegalDictionary.ice:9: dictionary `b2' uses an illegal key type -IllegalDictionary.ice:10: dictionary `b3' uses an illegal key type -IllegalDictionary.ice:11: dictionary `b4' uses an illegal key type -IllegalDictionary.ice:12: dictionary `b5' uses an illegal key type -IllegalDictionary.ice:18: dictionary `b6' uses an illegal key type -IllegalDictionary.ice:21: dictionary `b7' uses an illegal key type -IllegalDictionary.ice:35: dictionary `b8' uses an illegal key type -IllegalDictionary.ice:43: dictionary `b9' uses an illegal key type +IllegalDictionary.ice:22: dictionary `b1' uses an illegal key type +IllegalDictionary.ice:23: dictionary `b2' uses an illegal key type +IllegalDictionary.ice:24: dictionary `b3' uses an illegal key type +IllegalDictionary.ice:25: dictionary `b4' uses an illegal key type +IllegalDictionary.ice:26: dictionary `b5' uses an illegal key type +IllegalDictionary.ice:32: dictionary `b6' uses an illegal key type +IllegalDictionary.ice:35: dictionary `b7' uses an illegal key type +IllegalDictionary.ice:49: dictionary `b8' uses an illegal key type +IllegalDictionary.ice:57: dictionary `b9' uses an illegal key type diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice index befcb29913a..3f3513a5505 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + dictionary<bool, long> d1; // OK dictionary<byte, long> d2; // OK dictionary<short, long> d3; // OK diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err index 5eefb3eec02..ef54e5273bb 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.err +++ b/cpp/test/Slice/errorDetection/IllegalLocal.err @@ -1,20 +1,20 @@ -IllegalLocal.ice:5: non-local `i3' cannot have base local interface `i2' -IllegalLocal.ice:11: non-local `c2' cannot have base local interface `i2' -IllegalLocal.ice:17: non-local interface `i' cannot have operation `op' throwing local exception `le' -IllegalLocal.ice:20: non-local exception `le2' cannot have local base exception `le' -IllegalLocal.ice:26: non-local class`c3' cannot contain local member `lo1' -IllegalLocal.ice:27: cannot create proxy for local interface `i2' -IllegalLocal.ice:27: non-local class`c3' cannot contain local member `lo2' -IllegalLocal.ice:28: non-local class`c3' cannot contain local member `lo3' -IllegalLocal.ice:29: non-local class`c3' cannot contain local member `ls' -IllegalLocal.ice:34: non-local struct`s1' cannot contain local member `ls' -IllegalLocal.ice:39: non-local exception`e3' cannot contain local member `ls' -IllegalLocal.ice:42: non-local sequence `los' cannot have local element type -IllegalLocal.ice:45: non-local dictionary `d1' cannot have local key type -IllegalLocal.ice:46: non-local dictionary `d2' cannot have local value type -IllegalLocal.ice:47: non-local dictionary `d3' cannot have local key type -IllegalLocal.ice:47: non-local dictionary `d3' cannot have local value type -IllegalLocal.ice:52: non-local struct`s2' cannot contain local member `m' -IllegalLocal.ice:58: non-local struct`s3' cannot contain local member `e' -IllegalLocal.ice:63: non-local interface `i5' cannot have local parameter `p' in operation `op' -IllegalLocal.ice:64: non-local interface `i5' cannot have operation `op2' with local return type +IllegalLocal.ice:19: non-local `i3' cannot have base local interface `i2' +IllegalLocal.ice:25: non-local `c2' cannot have base local interface `i2' +IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le' +IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le' +IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1' +IllegalLocal.ice:41: cannot create proxy for local interface `i2' +IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2' +IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3' +IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls' +IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls' +IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls' +IllegalLocal.ice:56: non-local sequence `los' cannot have local element type +IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type +IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type +IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type +IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type +IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m' +IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e' +IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op' +IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice index 92cf9e0d9aa..7e63a3f1ce6 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.ice +++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + interface i1 {}; local interface i2 extends i1 {}; // OK diff --git a/cpp/test/Slice/errorDetection/IllegalMI.err b/cpp/test/Slice/errorDetection/IllegalMI.err index c88c80811fd..f9b3d846c31 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.err +++ b/cpp/test/Slice/errorDetection/IllegalMI.err @@ -1,26 +1,26 @@ -IllegalMI.ice:46: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:69: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:91: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:113: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:154: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:176: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:198: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:221: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:271: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:297: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:323: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:349: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:375: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:401: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:428: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:455: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:482: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:509: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:537: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:604: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:638: operation `op' is already defined as an operation in a base interface or class -IllegalMI.ice:759: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:820: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:881: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:940: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces -IllegalMI.ice:999: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:50: ambiguous multiple inheritance: `A3' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:73: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:95: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:117: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:158: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:180: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:202: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:225: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:275: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:301: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:327: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:353: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:379: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:405: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:432: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:459: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:486: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:513: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:541: ambiguous multiple inheritance: `A2' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:608: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:642: operation `op' is already defined as an operation in a base interface or class +IllegalMI.ice:763: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:824: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:885: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:944: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces +IllegalMI.ice:1003: ambiguous multiple inheritance: `A4' inherits operation `op' from two or more unrelated base interfaces diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice index 902ea19fe8c..00ef9063170 100644 --- a/cpp/test/Slice/errorDetection/IllegalMI.ice +++ b/cpp/test/Slice/errorDetection/IllegalMI.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err index 31c81068873..a7dfbac0f16 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.err @@ -1,26 +1,26 @@ -IllegalUseOfKeyword.ice:11: keyword `module' cannot be used as exception name -IllegalUseOfKeyword.ice:11: exceptions cannot be forward declared -IllegalUseOfKeyword.ice:12: keyword `void' cannot be used as exception name -IllegalUseOfKeyword.ice:17: keyword `exception' cannot be used as struct name -IllegalUseOfKeyword.ice:17: structs cannot be forward declared -IllegalUseOfKeyword.ice:18: keyword `class' cannot be used as struct name -IllegalUseOfKeyword.ice:23: keyword `interface' cannot be used as class name -IllegalUseOfKeyword.ice:24: keyword `struct' cannot be used as class name -IllegalUseOfKeyword.ice:30: keyword `local' cannot be used as interface name -IllegalUseOfKeyword.ice:31: keyword `extends' cannot be used as interface name -IllegalUseOfKeyword.ice:38: keyword `implements' cannot be used as operation name -IllegalUseOfKeyword.ice:40: keyword `throws' cannot be used as parameter name -IllegalUseOfKeyword.ice:40: keyword `void' cannot be used as parameter name -IllegalUseOfKeyword.ice:42: keyword `byte' cannot be used as parameter name -IllegalUseOfKeyword.ice:42: keyword `short' cannot be used as parameter name -IllegalUseOfKeyword.ice:47: keyword `int' cannot be used as data member name -IllegalUseOfKeyword.ice:48: keyword `long' cannot be used as data member name -IllegalUseOfKeyword.ice:49: keyword `float' cannot be used as data member name -IllegalUseOfKeyword.ice:50: keyword `double' cannot be used as data member name -IllegalUseOfKeyword.ice:53: keyword `Object' cannot be used as sequence name -IllegalUseOfKeyword.ice:55: keyword `LocalObject' cannot be used as dictionary name -IllegalUseOfKeyword.ice:57: keyword `string' cannot be used as enumeration name -IllegalUseOfKeyword.ice:64: keyword `sequence' cannot be used as enumerator -IllegalUseOfKeyword.ice:65: keyword `dictionary' cannot be used as enumerator -IllegalUseOfKeyword.ice:66: keyword `enum' cannot be used as enumerator -IllegalUseOfKeyword.ice:70: illegal inheritance from type Object +IllegalUseOfKeyword.ice:15: keyword `module' cannot be used as exception name +IllegalUseOfKeyword.ice:15: exceptions cannot be forward declared +IllegalUseOfKeyword.ice:16: keyword `void' cannot be used as exception name +IllegalUseOfKeyword.ice:21: keyword `exception' cannot be used as struct name +IllegalUseOfKeyword.ice:21: structs cannot be forward declared +IllegalUseOfKeyword.ice:22: keyword `class' cannot be used as struct name +IllegalUseOfKeyword.ice:27: keyword `interface' cannot be used as class name +IllegalUseOfKeyword.ice:28: keyword `struct' cannot be used as class name +IllegalUseOfKeyword.ice:34: keyword `local' cannot be used as interface name +IllegalUseOfKeyword.ice:35: keyword `extends' cannot be used as interface name +IllegalUseOfKeyword.ice:42: keyword `implements' cannot be used as operation name +IllegalUseOfKeyword.ice:44: keyword `throws' cannot be used as parameter name +IllegalUseOfKeyword.ice:44: keyword `void' cannot be used as parameter name +IllegalUseOfKeyword.ice:46: keyword `byte' cannot be used as parameter name +IllegalUseOfKeyword.ice:46: keyword `short' cannot be used as parameter name +IllegalUseOfKeyword.ice:51: keyword `int' cannot be used as data member name +IllegalUseOfKeyword.ice:52: keyword `long' cannot be used as data member name +IllegalUseOfKeyword.ice:53: keyword `float' cannot be used as data member name +IllegalUseOfKeyword.ice:54: keyword `double' cannot be used as data member name +IllegalUseOfKeyword.ice:57: keyword `Object' cannot be used as sequence name +IllegalUseOfKeyword.ice:59: keyword `LocalObject' cannot be used as dictionary name +IllegalUseOfKeyword.ice:61: keyword `string' cannot be used as enumeration name +IllegalUseOfKeyword.ice:68: keyword `sequence' cannot be used as enumerator +IllegalUseOfKeyword.ice:69: keyword `dictionary' cannot be used as enumerator +IllegalUseOfKeyword.ice:70: keyword `enum' cannot be used as enumerator +IllegalUseOfKeyword.ice:74: illegal inheritance from type Object diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice index 93fb07fe880..82738f51556 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.err b/cpp/test/Slice/errorDetection/InterfaceMismatch.err index 98dcd23a0f6..ae710e0e193 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.err +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.err @@ -1,8 +1,8 @@ -InterfaceMismatch.ice:12: class `Foo1' was declared as interface -InterfaceMismatch.ice:13: class `Foo1' was declared as interface -InterfaceMismatch.ice:13: parse error -InterfaceMismatch.ice:16: class `Foo2' was defined as interface -InterfaceMismatch.ice:19: interface `Foo3' was declared as class -InterfaceMismatch.ice:20: interface `Foo3' was declared as class -InterfaceMismatch.ice:20: parse error -InterfaceMismatch.ice:23: interface `Foo4' was defined as class +InterfaceMismatch.ice:16: class `Foo1' was declared as interface +InterfaceMismatch.ice:17: class `Foo1' was declared as interface +InterfaceMismatch.ice:17: parse error +InterfaceMismatch.ice:20: class `Foo2' was defined as interface +InterfaceMismatch.ice:23: interface `Foo3' was declared as class +InterfaceMismatch.ice:24: interface `Foo3' was declared as class +InterfaceMismatch.ice:24: parse error +InterfaceMismatch.ice:27: interface `Foo4' was defined as class diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice index 78beccc7543..f367c59d102 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err index 57f547d7bd6..d94d4658598 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err @@ -1,4 +1,4 @@ -InterfaceRedefinition.ice:12: redefinition of interface `Intf1' -InterfaceRedefinition.ice:12: parse error -InterfaceRedefinition.ice:16: redefinition of interface `Intf2' +InterfaceRedefinition.ice:16: redefinition of interface `Intf1' InterfaceRedefinition.ice:16: parse error +InterfaceRedefinition.ice:20: redefinition of interface `Intf2' +InterfaceRedefinition.ice:20: parse error diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice index 49aed46057a..5e8db486196 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.err b/cpp/test/Slice/errorDetection/LocalMismatch.err index a2b7807177d..f91cc2209c7 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.err +++ b/cpp/test/Slice/errorDetection/LocalMismatch.err @@ -1,16 +1,16 @@ -LocalMismatch.ice:12: local `Intf1' was declared non-local -LocalMismatch.ice:13: local `Intf1' was declared non-local -LocalMismatch.ice:13: parse error -LocalMismatch.ice:16: local `Intf2' was defined non-local -LocalMismatch.ice:19: non-local `Intf3' was declared local -LocalMismatch.ice:20: non-local `Intf3' was declared local -LocalMismatch.ice:20: parse error -LocalMismatch.ice:23: non-local `Intf4' was defined local -LocalMismatch.ice:26: local `Class1' was declared non-local -LocalMismatch.ice:27: local `Class1' was declared non-local -LocalMismatch.ice:27: parse error -LocalMismatch.ice:30: local `Class2' was defined non-local -LocalMismatch.ice:33: non-local `Class3' was declared local -LocalMismatch.ice:34: non-local `Class3' was declared local -LocalMismatch.ice:34: parse error -LocalMismatch.ice:37: non-local `Class4' was defined local +LocalMismatch.ice:16: local `Intf1' was declared non-local +LocalMismatch.ice:17: local `Intf1' was declared non-local +LocalMismatch.ice:17: parse error +LocalMismatch.ice:20: local `Intf2' was defined non-local +LocalMismatch.ice:23: non-local `Intf3' was declared local +LocalMismatch.ice:24: non-local `Intf3' was declared local +LocalMismatch.ice:24: parse error +LocalMismatch.ice:27: non-local `Intf4' was defined local +LocalMismatch.ice:30: local `Class1' was declared non-local +LocalMismatch.ice:31: local `Class1' was declared non-local +LocalMismatch.ice:31: parse error +LocalMismatch.ice:34: local `Class2' was defined non-local +LocalMismatch.ice:37: non-local `Class3' was declared local +LocalMismatch.ice:38: non-local `Class3' was declared local +LocalMismatch.ice:38: parse error +LocalMismatch.ice:41: non-local `Class4' was defined local diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice index f20a9ef34a3..53914d18cba 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.ice +++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err index 12901a65000..c82cf68b992 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.err @@ -1,6 +1,6 @@ -NameCanNotBeUsed.ice:13: class name `Foo' cannot be used as operation name -NameCanNotBeUsed.ice:19: interface name `IFoo' cannot be used as operation name -NameCanNotBeUsed.ice:24: class name `Bar' cannot be used as data member name -NameCanNotBeUsed.ice:30: exception name `EBar' cannot be used as exception member name -NameCanNotBeUsed.ice:35: struct name `SBar' cannot be used as member name -NameCanNotBeUsed.ice:36: struct `SBar' must have at least one member +NameCanNotBeUsed.ice:17: class name `Foo' cannot be used as operation name +NameCanNotBeUsed.ice:23: interface name `IFoo' cannot be used as operation name +NameCanNotBeUsed.ice:28: class name `Bar' cannot be used as data member name +NameCanNotBeUsed.ice:34: exception name `EBar' cannot be used as exception member name +NameCanNotBeUsed.ice:39: struct name `SBar' cannot be used as member name +NameCanNotBeUsed.ice:40: struct `SBar' must have at least one member diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice index 4513b9a6f09..5b9717e9a32 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.err b/cpp/test/Slice/errorDetection/NotClassOrInterface.err index 6dd8300ba7c..d9df5d08fa3 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.err +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.err @@ -1,9 +1,9 @@ -NotClassOrInterface.ice:15: `Seq' is not an interface -NotClassOrInterface.ice:16: `Seq' is not a class -NotClassOrInterface.ice:17: `Sequence3' is not an interface -NotClassOrInterface.ice:17: `Sequence2' is not an interface -NotClassOrInterface.ice:17: `Sequence1' is not an interface -NotClassOrInterface.ice:18: `Seq' is not a class -NotClassOrInterface.ice:18: `Sequence3' is not an interface -NotClassOrInterface.ice:18: `Sequence2' is not an interface -NotClassOrInterface.ice:18: `Sequence1' is not an interface +NotClassOrInterface.ice:19: `Seq' is not an interface +NotClassOrInterface.ice:20: `Seq' is not a class +NotClassOrInterface.ice:21: `Sequence3' is not an interface +NotClassOrInterface.ice:21: `Sequence2' is not an interface +NotClassOrInterface.ice:21: `Sequence1' is not an interface +NotClassOrInterface.ice:22: `Seq' is not a class +NotClassOrInterface.ice:22: `Sequence3' is not an interface +NotClassOrInterface.ice:22: `Sequence2' is not an interface +NotClassOrInterface.ice:22: `Sequence1' is not an interface diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice index 708dcb306d7..5cc8c7efa39 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/NotException.err b/cpp/test/Slice/errorDetection/NotException.err index 95293440630..6375c8e83b2 100644 --- a/cpp/test/Slice/errorDetection/NotException.err +++ b/cpp/test/Slice/errorDetection/NotException.err @@ -1,4 +1,4 @@ -NotException.ice:20: `C' is not an exception -NotException.ice:21: `S' is not an exception -NotException.ice:22: `D' is not an exception -NotException.ice:23: keyword `int' cannot be used as exception name +NotException.ice:24: `C' is not an exception +NotException.ice:25: `S' is not an exception +NotException.ice:26: `D' is not an exception +NotException.ice:27: keyword `int' cannot be used as exception name diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice index c06fc61fc92..27af9390b2a 100644 --- a/cpp/test/Slice/errorDetection/NotException.ice +++ b/cpp/test/Slice/errorDetection/NotException.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/NotType.err b/cpp/test/Slice/errorDetection/NotType.err index 5d36239a258..b28ddbc7502 100644 --- a/cpp/test/Slice/errorDetection/NotType.err +++ b/cpp/test/Slice/errorDetection/NotType.err @@ -1,15 +1,15 @@ -NotType.ice:17: `Mod' is not a type -NotType.ice:18: `Mod' is not a type -NotType.ice:19: `Mod' is not a type -NotType.ice:20: `Mod' is not a type -NotType.ice:21: `Module3' is not a type -NotType.ice:21: `Module2' is not a type -NotType.ice:21: `Module1' is not a type +NotType.ice:21: `Mod' is not a type NotType.ice:22: `Mod' is not a type -NotType.ice:22: `Module3' is not a type -NotType.ice:22: `Module2' is not a type -NotType.ice:22: `Module1' is not a type -NotType.ice:30: `E' is an exception, which cannot be used as a type -NotType.ice:31: struct `S' must have at least one member -NotType.ice:35: `E' is an exception, which cannot be used as a type -NotType.ice:35: `E' is an exception, which cannot be used as a type +NotType.ice:23: `Mod' is not a type +NotType.ice:24: `Mod' is not a type +NotType.ice:25: `Module3' is not a type +NotType.ice:25: `Module2' is not a type +NotType.ice:25: `Module1' is not a type +NotType.ice:26: `Mod' is not a type +NotType.ice:26: `Module3' is not a type +NotType.ice:26: `Module2' is not a type +NotType.ice:26: `Module1' is not a type +NotType.ice:34: `E' is an exception, which cannot be used as a type +NotType.ice:35: struct `S' must have at least one member +NotType.ice:39: `E' is an exception, which cannot be used as a type +NotType.ice:39: `E' is an exception, which cannot be used as a type diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice index 4557da3cb7f..202034299b3 100644 --- a/cpp/test/Slice/errorDetection/NotType.ice +++ b/cpp/test/Slice/errorDetection/NotType.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.err b/cpp/test/Slice/errorDetection/OperationRedefinition.err index 240f23410d6..befa3ed4cdf 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.err +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.err @@ -1 +1 @@ -OperationRedefinition.ice:14: redefinition of operation `operation' as operation `operation' +OperationRedefinition.ice:18: redefinition of operation `operation' as operation `operation' diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice index 1b793fb69bd..359dd8aa937 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err index c1f3635177c..0eede01a786 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.err @@ -1,2 +1,2 @@ -ParamsOutOfOrder.ice:13: `l3': in parameters cannot follow out parameters -ParamsOutOfOrder.ice:14: `l3': in parameters cannot follow out parameters +ParamsOutOfOrder.ice:17: `l3': in parameters cannot follow out parameters +ParamsOutOfOrder.ice:18: `l3': in parameters cannot follow out parameters diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice index 24261977f3e..1d5184e31b3 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err index dd46aca7d70..8cfe1c1173a 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.err @@ -1,2 +1,2 @@ -RedefinitionAsClass.ice:12: declaration of already defined `Sequence1' as class -RedefinitionAsClass.ice:15: redefinition of sequence `Sequence2' as class +RedefinitionAsClass.ice:16: declaration of already defined `Sequence1' as class +RedefinitionAsClass.ice:19: redefinition of sequence `Sequence2' as class diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice index 11ab9e02a56..3a3bd9f8b7f 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err index 502fcc8e523..dbbf3f68d98 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.err @@ -1 +1 @@ -RedefinitionAsDataMember.ice:14: redefinition of operation `operation' as data member `operation' +RedefinitionAsDataMember.ice:18: redefinition of operation `operation' as data member `operation' diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice index 15564403a79..bb6f785ea0a 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err index 60014b2d2c8..8a6858f8b90 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.err @@ -1 +1 @@ -RedefinitionAsDictionary.ice:12: redefinition of class `C' as dictionary +RedefinitionAsDictionary.ice:16: redefinition of class `C' as dictionary diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice index 72aab19a267..585eb6e53c1 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err index 0749ccc2ad4..78992bb773b 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.err @@ -1,2 +1,2 @@ -RedefinitionAsEnum.ice:12: redefinition of class `C' as enumeration -RedefinitionAsEnum.ice:12: redefinition of class `C' as enumerator +RedefinitionAsEnum.ice:16: redefinition of class `C' as enumeration +RedefinitionAsEnum.ice:16: redefinition of class `C' as enumerator diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice index e5b4bb2004d..286d3d7ea78 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err index cbf033e008b..ca3919b9536 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.err @@ -1,2 +1,2 @@ -RedefinitionAsEnumerator.ice:13: redefinition of class `C' as enumerator -RedefinitionAsEnumerator.ice:13: redefinition of sequence `Seq' as enumerator +RedefinitionAsEnumerator.ice:17: redefinition of class `C' as enumerator +RedefinitionAsEnumerator.ice:17: redefinition of sequence `Seq' as enumerator diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice index c5d411ca0ec..20b7447e63c 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err index 21139424809..2a5d92b882c 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.err @@ -1,2 +1,2 @@ -RedefinitionAsInterface.ice:12: declaration of already defined `Sequence1' as interface -RedefinitionAsInterface.ice:15: redefinition of sequence `Sequence2' as interface +RedefinitionAsInterface.ice:16: declaration of already defined `Sequence1' as interface +RedefinitionAsInterface.ice:19: redefinition of sequence `Sequence2' as interface diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice index bcb23f8c69e..98447dd4252 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err index 2991d9dce09..680ec8ab739 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.err @@ -1 +1 @@ -RedefinitionAsModule.ice:12: redefinition of sequence `Seq' as module +RedefinitionAsModule.ice:16: redefinition of sequence `Seq' as module diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice index d2ac2e80d4d..d18f0d407cb 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err index ec261129525..361a03d9192 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.err @@ -1 +1 @@ -RedefinitionAsOperation.ice:14: redefinition of data member `member' as operation `member' +RedefinitionAsOperation.ice:18: redefinition of data member `member' as operation `member' diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice index 07e3a3703f2..39f46e60573 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err index ec61073f58a..706eb02db02 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.err @@ -1 +1 @@ -RedefinitionAsSequence.ice:12: redefinition of class `C' as sequence +RedefinitionAsSequence.ice:16: redefinition of class `C' as sequence diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice index 5c98a5e8f33..954d7f12372 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/Reserved.err b/cpp/test/Slice/errorDetection/Reserved.err index 79d7531c3d8..9ea9fb7f805 100644 --- a/cpp/test/Slice/errorDetection/Reserved.err +++ b/cpp/test/Slice/errorDetection/Reserved.err @@ -1,21 +1,21 @@ -Reserved.ice:29: illegal identifier `Prx': `Prx' suffix is reserved -Reserved.ice:30: illegal identifier `abcPrx': `Prx' suffix is reserved -Reserved.ice:31: illegal identifier `Ptr': `Ptr' suffix is reserved -Reserved.ice:32: illegal identifier `abcPtr': `Ptr' suffix is reserved -Reserved.ice:33: illegal identifier `Helper': `Helper' suffix is reserved -Reserved.ice:34: illegal identifier `abcHelper': `Helper' suffix is reserved -Reserved.ice:35: illegal identifier `Holder': `Holder' suffix is reserved -Reserved.ice:36: illegal identifier `abcHolder': `Holder' suffix is reserved -Reserved.ice:37: illegal identifier `Operations': `Operations' suffix is reserved -Reserved.ice:38: illegal identifier `abcOperations': `Operations' suffix is reserved -Reserved.ice:39: illegal identifier `Ice': `Ice' prefix is reserved -Reserved.ice:40: illegal identifier `ice': `ice' prefix is reserved -Reserved.ice:40: constant `ice' differs only in capitalization from constant `Ice' -Reserved.ice:41: illegal identifier `icea': `ice' prefix is reserved -Reserved.ice:42: illegal identifier `Iceblah': `Ice' prefix is reserved -Reserved.ice:43: illegal identifier `IceFoo': `Ice' prefix is reserved -Reserved.ice:44: illegal identifier `icecream': `ice' prefix is reserved -Reserved.ice:45: illegal identifier `ICEpick': `ICE' prefix is reserved -Reserved.ice:46: illegal identifier `iCEaxe': `iCE' prefix is reserved -Reserved.ice:49: illegal identifier `Ice': `Ice' prefix is reserved -Reserved.ice:50: illegal identifier `IceFoo': `Ice' prefix is reserved +Reserved.ice:33: illegal identifier `Prx': `Prx' suffix is reserved +Reserved.ice:34: illegal identifier `abcPrx': `Prx' suffix is reserved +Reserved.ice:35: illegal identifier `Ptr': `Ptr' suffix is reserved +Reserved.ice:36: illegal identifier `abcPtr': `Ptr' suffix is reserved +Reserved.ice:37: illegal identifier `Helper': `Helper' suffix is reserved +Reserved.ice:38: illegal identifier `abcHelper': `Helper' suffix is reserved +Reserved.ice:39: illegal identifier `Holder': `Holder' suffix is reserved +Reserved.ice:40: illegal identifier `abcHolder': `Holder' suffix is reserved +Reserved.ice:41: illegal identifier `Operations': `Operations' suffix is reserved +Reserved.ice:42: illegal identifier `abcOperations': `Operations' suffix is reserved +Reserved.ice:43: illegal identifier `Ice': `Ice' prefix is reserved +Reserved.ice:44: illegal identifier `ice': `ice' prefix is reserved +Reserved.ice:44: constant `ice' differs only in capitalization from constant `Ice' +Reserved.ice:45: illegal identifier `icea': `ice' prefix is reserved +Reserved.ice:46: illegal identifier `Iceblah': `Ice' prefix is reserved +Reserved.ice:47: illegal identifier `IceFoo': `Ice' prefix is reserved +Reserved.ice:48: illegal identifier `icecream': `ice' prefix is reserved +Reserved.ice:49: illegal identifier `ICEpick': `ICE' prefix is reserved +Reserved.ice:50: illegal identifier `iCEaxe': `iCE' prefix is reserved +Reserved.ice:53: illegal identifier `Ice': `Ice' prefix is reserved +Reserved.ice:54: illegal identifier `IceFoo': `Ice' prefix is reserved diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice index f198259d6d4..efeab30dada 100644 --- a/cpp/test/Slice/errorDetection/Reserved.ice +++ b/cpp/test/Slice/errorDetection/Reserved.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/SelfContainment.err b/cpp/test/Slice/errorDetection/SelfContainment.err index a87b053e7f2..4af59683fbb 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.err +++ b/cpp/test/Slice/errorDetection/SelfContainment.err @@ -1 +1 @@ -SelfContainment.ice:4: struct `x' cannot contain itself +SelfContainment.ice:18: struct `x' cannot contain itself diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice index 25dd5f90f37..9422e4b2df8 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.ice +++ b/cpp/test/Slice/errorDetection/SelfContainment.ice @@ -1,3 +1,17 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// ZeroC, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + struct x { int i; diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.err b/cpp/test/Slice/errorDetection/SequenceRedefinition.err index a4a2ff915a4..98e9430ad5b 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.err +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.err @@ -1 +1 @@ -SequenceRedefinition.ice:12: redefinition of sequence `Seq' as sequence +SequenceRedefinition.ice:16: redefinition of sequence `Seq' as sequence diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice index 29ed8ed6f59..ce38d50655f 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/StructMembers.err b/cpp/test/Slice/errorDetection/StructMembers.err index 188a8ff2d9d..a92a2f1eb92 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.err +++ b/cpp/test/Slice/errorDetection/StructMembers.err @@ -1,7 +1,7 @@ -StructMembers.ice:13: struct `s1' must have at least one member -StructMembers.ice:45: missing data member name -StructMembers.ice:51: missing data member name -StructMembers.ice:51: `;' missing after definition +StructMembers.ice:17: struct `s1' must have at least one member +StructMembers.ice:49: missing data member name StructMembers.ice:55: missing data member name -StructMembers.ice:61: missing data member name -StructMembers.ice:61: `;' missing after definition +StructMembers.ice:55: `;' missing after definition +StructMembers.ice:59: missing data member name +StructMembers.ice:65: missing data member name +StructMembers.ice:65: `;' missing after definition diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice index 2f45e43a9f4..993c4523db9 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.ice +++ b/cpp/test/Slice/errorDetection/StructMembers.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/Undefined.err b/cpp/test/Slice/errorDetection/Undefined.err index be2203abc3f..e069c49a3eb 100644 --- a/cpp/test/Slice/errorDetection/Undefined.err +++ b/cpp/test/Slice/errorDetection/Undefined.err @@ -1,11 +1,11 @@ -Undefined.ice:11: `Foo' is not defined -Undefined.ice:12: `Foo' is not defined -Undefined.ice:13: `Foo' is not defined -Undefined.ice:14: `Foo' is not defined -Undefined.ice:15: `Foo3' is not defined -Undefined.ice:15: `Foo2' is not defined -Undefined.ice:15: `Foo1' is not defined +Undefined.ice:15: `Foo' is not defined Undefined.ice:16: `Foo' is not defined -Undefined.ice:16: `Foo3' is not defined -Undefined.ice:16: `Foo2' is not defined -Undefined.ice:16: `Foo1' is not defined +Undefined.ice:17: `Foo' is not defined +Undefined.ice:18: `Foo' is not defined +Undefined.ice:19: `Foo3' is not defined +Undefined.ice:19: `Foo2' is not defined +Undefined.ice:19: `Foo1' is not defined +Undefined.ice:20: `Foo' is not defined +Undefined.ice:20: `Foo3' is not defined +Undefined.ice:20: `Foo2' is not defined +Undefined.ice:20: `Foo1' is not defined diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice index 9dd8e99506b..792da526310 100644 --- a/cpp/test/Slice/errorDetection/Undefined.ice +++ b/cpp/test/Slice/errorDetection/Undefined.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.err b/cpp/test/Slice/errorDetection/WrongProxyType.err index 0b385867a0a..8665b846f14 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.err +++ b/cpp/test/Slice/errorDetection/WrongProxyType.err @@ -1,6 +1,6 @@ -WrongProxyType.ice:16: `Seq' must be class or interface -WrongProxyType.ice:17: `Seq' must be class or interface -WrongProxyType.ice:18: `Seq' must be class or interface -WrongProxyType.ice:20: `Dict' must be class or interface -WrongProxyType.ice:21: `Dict' must be class or interface -WrongProxyType.ice:22: `Dict' must be class or interface +WrongProxyType.ice:20: `Seq' must be class or interface +WrongProxyType.ice:21: `Seq' must be class or interface +WrongProxyType.ice:22: `Seq' must be class or interface +WrongProxyType.ice:24: `Dict' must be class or interface +WrongProxyType.ice:25: `Dict' must be class or interface +WrongProxyType.ice:26: `Dict' must be class or interface diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice index bd33c3c7d06..8cee4008789 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.ice +++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice index 4c6257c73eb..cfa4e7edb11 100644 --- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice +++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index fc18bad69b8..2908efd341c 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/XMLTransform/Makefile b/cpp/test/XMLTransform/Makefile index 534e158d0d6..0311302e04c 100644 --- a/cpp/test/XMLTransform/Makefile +++ b/cpp/test/XMLTransform/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/XMLTransform/transform/Makefile b/cpp/test/XMLTransform/transform/Makefile index 781a8cb7a9b..985c4b27c15 100644 --- a/cpp/test/XMLTransform/transform/Makefile +++ b/cpp/test/XMLTransform/transform/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/XMLTransform/transform/Populate.cpp b/cpp/test/XMLTransform/transform/Populate.cpp index b79075fd56e..50601953437 100644 --- a/cpp/test/XMLTransform/transform/Populate.cpp +++ b/cpp/test/XMLTransform/transform/Populate.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/XMLTransform/transform/Validate.cpp b/cpp/test/XMLTransform/transform/Validate.cpp index 4b25e733327..2dc311f31e6 100644 --- a/cpp/test/XMLTransform/transform/Validate.cpp +++ b/cpp/test/XMLTransform/transform/Validate.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2002 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/XMLTransform/transform/run.py b/cpp/test/XMLTransform/transform/run.py index f8239b2c3f0..1ef1cb30895 100755 --- a/cpp/test/XMLTransform/transform/run.py +++ b/cpp/test/XMLTransform/transform/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2002 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Yellow/Makefile b/cpp/test/Yellow/Makefile index 709fde60e40..48abf0f7b66 100644 --- a/cpp/test/Yellow/Makefile +++ b/cpp/test/Yellow/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Yellow/basicYellow/Client.cpp b/cpp/test/Yellow/basicYellow/Client.cpp index 18f35975d13..6b0c69a656f 100644 --- a/cpp/test/Yellow/basicYellow/Client.cpp +++ b/cpp/test/Yellow/basicYellow/Client.cpp @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** diff --git a/cpp/test/Yellow/basicYellow/Makefile b/cpp/test/Yellow/basicYellow/Makefile index e6ef665faa9..ef5187c32da 100644 --- a/cpp/test/Yellow/basicYellow/Makefile +++ b/cpp/test/Yellow/basicYellow/Makefile @@ -2,9 +2,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py index 1a7b88ef90f..4b705cc15d0 100755 --- a/cpp/test/Yellow/basicYellow/run.py +++ b/cpp/test/Yellow/basicYellow/run.py @@ -3,9 +3,13 @@ # # Copyright (c) 2001 # ZeroC, Inc. -# Huntsville, AL, USA +# Billerica, MA, USA # -# All Rights Reserved +# All Rights Reserved. +# +# Ice is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. # # ********************************************************************** diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index 7416651b73d..7c3b93b6d06 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -2,9 +2,13 @@ // // Copyright (c) 2001 // ZeroC, Inc. -// Huntsville, AL, USA +// Billerica, MA, USA // -// All Rights Reserved +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. // // ********************************************************************** |