summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-06-13 11:26:20 +0200
committerJose <jose@zeroc.com>2017-06-13 11:26:20 +0200
commit71d87f6dc7294a5746f7fe0cf152d5526245d15a (patch)
tree21c375e015cd9f4f35c098bd4308c96cfe3952cd /cpp
parentFix for ICE-8015 - clear ACM monitor connections from the timer thread (diff)
downloadice-71d87f6dc7294a5746f7fe0cf152d5526245d15a.tar.bz2
ice-71d87f6dc7294a5746f7fe0cf152d5526245d15a.tar.xz
ice-71d87f6dc7294a5746f7fe0cf152d5526245d15a.zip
Fix copyright headers
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h2
-rw-r--r--cpp/src/IceGrid/Parser.cpp2
-rw-r--r--cpp/src/IceStorm/Parser.cpp2
-rw-r--r--cpp/src/Slice/JavaUtil.cpp2
-rw-r--r--cpp/src/slice2php/Main.cpp2
-rw-r--r--cpp/test/ios/bundles/BundleInfo.plist2
-rw-r--r--cpp/test/ios/controller/Bundle/Info.plist2
-rw-r--r--cpp/test/ios/controller/Classes/main.m9
8 files changed, 12 insertions, 11 deletions
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index 988fccbc60b..6333b2ef824 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -16,7 +16,7 @@
#define ICE_STRING_VERSION "3.7.0\0"
#define ICE_SO_VERSION "37\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
-#define ICE_COPYRIGHT "\251 2003-2016 ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 2003-2017 ZeroC, Inc.\0"
#define ICE_PRODUCT_NAME "Ice\0"
#ifdef ICE_CPP11_MAPPING
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 685c043d2b3..81ab1d9de49 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2526,7 +2526,7 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow,
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2016 ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2017 ZeroC, Inc." << endl;
}
void
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index a30c369c402..32ccd9102d4 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -410,7 +410,7 @@ Parser::current(const list<string>& args)
void
Parser::showBanner()
{
- consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2016 ZeroC, Inc." << endl;
+ consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2017 ZeroC, Inc." << endl;
}
//
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 9b3b1b81f53..b5c7f669604 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -771,7 +771,7 @@ Slice::JavaOutput::printHeader()
static const char* header =
"// **********************************************************************\n"
"//\n"
-"// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n"
"//\n"
"// This copy of Ice is licensed to you under the terms described in the\n"
"// ICE_LICENSE file included in this distribution.\n"
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index f3dd46e1df5..e16536d6e0c 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1549,7 +1549,7 @@ printHeader(IceUtilInternal::Output& out)
static const char* header =
"// **********************************************************************\n"
"//\n"
- "// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n"
+ "// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n"
"//\n"
"// This copy of Ice is licensed to you under the terms described in the\n"
"// ICE_LICENSE file included in this distribution.\n"
diff --git a/cpp/test/ios/bundles/BundleInfo.plist b/cpp/test/ios/bundles/BundleInfo.plist
index eefb65fecea..2f21eaf6aea 100644
--- a/cpp/test/ios/bundles/BundleInfo.plist
+++ b/cpp/test/ios/bundles/BundleInfo.plist
@@ -43,6 +43,6 @@
<key>DTXcodeBuild</key>
<string>4H127</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 2013 ZeroC. All rights reserved.</string>
+ <string>Copyright © 2013-2017 ZeroC. All rights reserved.</string>
</dict>
</plist>
diff --git a/cpp/test/ios/controller/Bundle/Info.plist b/cpp/test/ios/controller/Bundle/Info.plist
index 32e926f85b2..712e25183b3 100644
--- a/cpp/test/ios/controller/Bundle/Info.plist
+++ b/cpp/test/ios/controller/Bundle/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 2016 ZeroC, Inc. All rights reserved.</string>
+ <string>Copyright © 2013-2017 ZeroC, Inc. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
diff --git a/cpp/test/ios/controller/Classes/main.m b/cpp/test/ios/controller/Classes/main.m
index bd3a0a0c555..0b9518dfad4 100644
--- a/cpp/test/ios/controller/Classes/main.m
+++ b/cpp/test/ios/controller/Classes/main.m
@@ -1,10 +1,11 @@
+// **********************************************************************
//
-// main.m
-// C++ Test Controller
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
//
-// Created by Benoit Foucher on 08/12/2016.
-// Copyright © 2016 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.
//
+// **********************************************************************
#import <UIKit/UIKit.h>
#import "AppDelegate.h"