diff options
author | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
commit | dc5678e6988bad79336033518f8f2378f7c34cb2 (patch) | |
tree | f1b7d00d8bfde31297c4473d62ace3d05031b985 /cpp/test/IceUtil/priority | |
parent | Connection wizard dialog becomes readonly (diff) | |
parent | ICE-7506 - Update copyright to 2017 (diff) | |
download | ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.bz2 ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.xz ice-dc5678e6988bad79336033518f8f2378f7c34cb2.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/IceUtil/priority')
-rw-r--r-- | cpp/test/IceUtil/priority/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/PriorityInversion.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/PriorityInversion.h | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TestBase.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TestBase.h | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TestSuite.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TestSuite.h | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/ThreadPriority.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/ThreadPriority.h | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TimerPriority.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceUtil/priority/TimerPriority.h | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/cpp/test/IceUtil/priority/Client.cpp b/cpp/test/IceUtil/priority/Client.cpp index 05fbed1b3b5..b31259ff6b6 100644 --- a/cpp/test/IceUtil/priority/Client.cpp +++ b/cpp/test/IceUtil/priority/Client.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp index 15aa02c7b10..5517d78707c 100644 --- a/cpp/test/IceUtil/priority/PriorityInversion.cpp +++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/PriorityInversion.h b/cpp/test/IceUtil/priority/PriorityInversion.h index 4a4142e30f1..258bade9686 100644 --- a/cpp/test/IceUtil/priority/PriorityInversion.h +++ b/cpp/test/IceUtil/priority/PriorityInversion.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TestBase.cpp b/cpp/test/IceUtil/priority/TestBase.cpp index 50aafbe49ec..e81f79e294d 100644 --- a/cpp/test/IceUtil/priority/TestBase.cpp +++ b/cpp/test/IceUtil/priority/TestBase.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TestBase.h b/cpp/test/IceUtil/priority/TestBase.h index 7f6bc3fc992..d5c61f296dd 100644 --- a/cpp/test/IceUtil/priority/TestBase.h +++ b/cpp/test/IceUtil/priority/TestBase.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TestSuite.cpp b/cpp/test/IceUtil/priority/TestSuite.cpp index 1749457eefc..16ee2f1d05f 100644 --- a/cpp/test/IceUtil/priority/TestSuite.cpp +++ b/cpp/test/IceUtil/priority/TestSuite.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TestSuite.h b/cpp/test/IceUtil/priority/TestSuite.h index e0cec1c7a2a..68bbfb9100d 100644 --- a/cpp/test/IceUtil/priority/TestSuite.h +++ b/cpp/test/IceUtil/priority/TestSuite.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/ThreadPriority.cpp b/cpp/test/IceUtil/priority/ThreadPriority.cpp index d5fbbadb673..8df4819cafc 100644 --- a/cpp/test/IceUtil/priority/ThreadPriority.cpp +++ b/cpp/test/IceUtil/priority/ThreadPriority.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/ThreadPriority.h b/cpp/test/IceUtil/priority/ThreadPriority.h index b24ad2436b0..386184a02a7 100644 --- a/cpp/test/IceUtil/priority/ThreadPriority.h +++ b/cpp/test/IceUtil/priority/ThreadPriority.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TimerPriority.cpp b/cpp/test/IceUtil/priority/TimerPriority.cpp index d409f079780..cc0b1c9f4ae 100644 --- a/cpp/test/IceUtil/priority/TimerPriority.cpp +++ b/cpp/test/IceUtil/priority/TimerPriority.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. diff --git a/cpp/test/IceUtil/priority/TimerPriority.h b/cpp/test/IceUtil/priority/TimerPriority.h index d3bdd11cc2f..a7f9513559f 100644 --- a/cpp/test/IceUtil/priority/TimerPriority.h +++ b/cpp/test/IceUtil/priority/TimerPriority.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. |