From ee0ed2b96a904df8bb513f1183ad47d998c8f5e1 Mon Sep 17 00:00:00 2001 From: Thijs Sassen Date: Thu, 23 Apr 2020 13:51:01 +0200 Subject: [PATCH] Adjusted wrong copyright headers, added missing copyright headers and added license overview in the readme --- README.md | 6 + .../modules/GTest/include/dds/ddscxx/test.h | 11 + src/ddscxx/include/dds/LICENSE | 190 ++++++++++++++ .../dds/core/detail/BuiltinTopicTypes.hpp | 11 +- .../include/dds/core/detail/inttypes.hpp | 5 - .../include/dds/core/detail/old_win_stdint.h | 247 ------------------ .../dds/core/xtypes/detail/Annotation.hpp | 11 + .../core/xtypes/detail/CollectionTypes.hpp | 11 + .../dds/core/xtypes/detail/DynamicData.hpp | 11 + .../dds/core/xtypes/detail/DynamicType.hpp | 11 + .../dds/core/xtypes/detail/MemberType.hpp | 11 + .../dds/core/xtypes/detail/PrimitiveTypes.hpp | 11 + .../dds/core/xtypes/detail/StructType.hpp | 11 + .../dds/core/xtypes/detail/TypeProvider.hpp | 11 + .../dds/core/xtypes/detail/UnionCase.hpp | 11 + .../dds/core/xtypes/detail/UnionType.hpp | 11 + .../include/dds/pub/detail/CoherentSet.hpp | 11 + .../dds/pub/detail/SuspendedPublication.hpp | 11 + .../dds/sub/cond/detail/ReadCondition.hpp | 11 + .../include/dds/sub/detail/CoherentAccess.hpp | 11 + .../include/dds/sub/detail/DataReader.hpp | 11 + .../dds/sub/detail/GenerationCount.hpp | 11 + .../include/dds/sub/detail/LoanedSamples.hpp | 11 + src/ddscxx/include/dds/sub/detail/Query.hpp | 11 +- src/ddscxx/include/dds/sub/detail/Rank.hpp | 11 + .../include/dds/sub/detail/SampleInfo.hpp | 11 + .../include/dds/topic/detail/Filter.hpp | 11 + .../cyclonedds/pub/PublisherDelegate.hpp | 18 -- .../cyclonedds/sub/AnyDataReaderDelegate.hpp | 18 -- src/ddscxx/src/dds/domain/discovery.cpp | 25 +- src/ddscxx/src/dds/domain/find.cpp | 25 +- .../core/cond/ConditionDelegate.cpp | 12 +- .../eclipse/cyclonedds/sub/QueryDelegate.cpp | 25 +- .../sub/cond/QueryConditionDelegate.cpp | 12 +- .../sub/cond/ReadConditionDelegate.cpp | 22 +- .../cyclonedds/topic/FilterDelegate.cpp | 14 +- .../src/org/eclipse/cyclonedds/topic/find.cpp | 22 +- src/ddscxx/tests/EntityStatus.cpp | 11 + src/ddscxx/tests/ListenerSetup.cpp | 11 + src/ddscxx/tests/ListenerStress.cpp | 11 + src/ddscxx/tests/ListenerTrigger.cpp | 11 + src/ddscxx/tests/data/HelloWorldData.idl | 12 + src/ddscxx/tests/data/Space.idl | 12 +- src/examples/helloworld/HelloWorldData.idl | 29 +- src/examples/helloworld/publisher.cpp | 11 + src/examples/helloworld/subscriber.cpp | 11 + 46 files changed, 619 insertions(+), 394 deletions(-) create mode 100644 src/ddscxx/include/dds/LICENSE delete mode 100644 src/ddscxx/include/dds/core/detail/old_win_stdint.h diff --git a/README.md b/README.md index 5dd84a0..e059270 100644 --- a/README.md +++ b/README.md @@ -85,3 +85,9 @@ Depending on the target, you now have packages. ## Documentation Documentation for the CXX API can be found [here](https://atolab.github.io/cdds-docs/api/cxx/index.html) + +## License + +This project contains 2 types of license: Apach2 and Eclipse Public License / Eclipse Distribution License +* The Apache2 license located in src/ddscxx/include/dds is for all files under src/ddscxx/include/dds except the details directories +* Eclipse Public License / Eclipse Distribution License is valid for all other files. diff --git a/src/cmake/modules/GTest/include/dds/ddscxx/test.h b/src/cmake/modules/GTest/include/dds/ddscxx/test.h index 14003d4..cc6702f 100644 --- a/src/cmake/modules/GTest/include/dds/ddscxx/test.h +++ b/src/cmake/modules/GTest/include/dds/ddscxx/test.h @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef GTEST_TEST_H #define GTEST_TEST_H diff --git a/src/ddscxx/include/dds/LICENSE b/src/ddscxx/include/dds/LICENSE new file mode 100644 index 0000000..b353abd --- /dev/null +++ b/src/ddscxx/include/dds/LICENSE @@ -0,0 +1,190 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2020 ADLINK Technology Limited + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/ddscxx/include/dds/core/detail/BuiltinTopicTypes.hpp b/src/ddscxx/include/dds/core/detail/BuiltinTopicTypes.hpp index 24affa1..ae4b89d 100644 --- a/src/ddscxx/include/dds/core/detail/BuiltinTopicTypes.hpp +++ b/src/ddscxx/include/dds/core/detail/BuiltinTopicTypes.hpp @@ -1,8 +1,13 @@ /* - * BuiltinTopicTypes.hpp + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * Created on: Oct 23, 2012 - * Author: angelo + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ #ifndef OMG_DDS_CORE_DELEGATE_BUILTIN_TOPIC_TYPES_HPP_ diff --git a/src/ddscxx/include/dds/core/detail/inttypes.hpp b/src/ddscxx/include/dds/core/detail/inttypes.hpp index 50e73a7..c162af9 100644 --- a/src/ddscxx/include/dds/core/detail/inttypes.hpp +++ b/src/ddscxx/include/dds/core/detail/inttypes.hpp @@ -23,12 +23,7 @@ * simply include that one. Under toolchains that do not, this header must * provide equivalent definitions. */ -#if defined _MSC_VER && (_MSC_VER <= 1500) -// VS 2005 & 2008 confirmed to have no stdint.h; predecessors presumed likewise -#include -#else #include -#endif // End of implementation diff --git a/src/ddscxx/include/dds/core/detail/old_win_stdint.h b/src/ddscxx/include/dds/core/detail/old_win_stdint.h deleted file mode 100644 index f7918b2..0000000 --- a/src/ddscxx/include/dds/core/detail/old_win_stdint.h +++ /dev/null @@ -1,247 +0,0 @@ -/** - * @file - * This file provides definitions for stdint header types for versions of - * Windows that didn't have it. It was discovered on the intahwebs at - * http://snipplr.com/view/18199/stdinth/ where it was described thus: - * "A public domain stdint.h. Original code is from a public domain version - * in the MinGW distribution. This one has been modified to fix a couple bugs - * (to make some macros 64-bit aware) and to make it compatible with VC6." - * It was published there on 08/12/09 - * @see dds/core/detail/inttypes.h - */ - -/* ISO C9x 7.18 Integer types - * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * Contributor: Danny Smith - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Date: 2000-12-02 - * - * mwb: This was modified in the following ways: - * - * - make it compatible with Visual C++ 6 (which uses - * non-standard keywords and suffixes for 64-bit types) - * - some environments need stddef.h included (for wchar stuff?) - * - handle the fact that Microsoft's limits.h header defines - * SIZE_MAX - * - make corrections for SIZE_MAX, INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX, - * PTRDIFF_MIN, PTRDIFF_MAX, SIG_ATOMIC_MIN, and SIG_ATOMIC_MAX - * to be 64-bit aware. - */ - - -#ifndef _STDINT_H -#define _STDINT_H -#define __need_wint_t -#define __need_wchar_t -#include -#include - -#if _MSC_VER && (_MSC_VER < 1300) -/* using MSVC 6 or earlier - no "long long" type, but might have _int64 type */ -#define __STDINT_LONGLONG __int64 -#define __STDINT_LONGLONG_SUFFIX i64 -#else -#define __STDINT_LONGLONG long long -#define __STDINT_LONGLONG_SUFFIX LL -#endif - -#if !defined( PASTE) -#define PASTE2( x, y) x##y -#define PASTE( x, y) PASTE2( x, y) -#endif /* PASTE */ - - -/* 7.18.1.1 Exact-width integer types */ -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef int int32_t; -typedef unsigned uint32_t; -typedef __STDINT_LONGLONG int64_t; -typedef unsigned __STDINT_LONGLONG uint64_t; - -/* 7.18.1.2 Minimum-width integer types */ -typedef signed char int_least8_t; -typedef unsigned char uint_least8_t; -typedef short int_least16_t; -typedef unsigned short uint_least16_t; -typedef int int_least32_t; -typedef unsigned uint_least32_t; -typedef __STDINT_LONGLONG int_least64_t; -typedef unsigned __STDINT_LONGLONG uint_least64_t; - -/* 7.18.1.3 Fastest minimum-width integer types - * Not actually guaranteed to be fastest for all purposes - * Here we use the exact-width types for 8 and 16-bit ints. - */ -typedef char int_fast8_t; -typedef unsigned char uint_fast8_t; -typedef short int_fast16_t; -typedef unsigned short uint_fast16_t; -typedef int int_fast32_t; -typedef unsigned int uint_fast32_t; -typedef __STDINT_LONGLONG int_fast64_t; -typedef unsigned __STDINT_LONGLONG uint_fast64_t; - -/* 7.18.1.4 Integer types capable of holding object pointers */ -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifdef _WIN64 -typedef __STDINT_LONGLONG intptr_t -#else -typedef int intptr_t; -#endif /* _WIN64 */ -#endif /* _INTPTR_T_DEFINED */ - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __STDINT_LONGLONG uintptr_t -#else -typedef unsigned int uintptr_t; -#endif /* _WIN64 */ -#endif /* _UINTPTR_T_DEFINED */ - -/* 7.18.1.5 Greatest-width integer types */ -typedef __STDINT_LONGLONG intmax_t; -typedef unsigned __STDINT_LONGLONG uintmax_t; - -/* 7.18.2 Limits of specified-width integer types */ -#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS) - -/* 7.18.2.1 Limits of exact-width integer types */ -#define INT8_MIN (-128) -#define INT16_MIN (-32768) -#define INT32_MIN (-2147483647 - 1) -#define INT64_MIN (PASTE( -9223372036854775807, __STDINT_LONGLONG_SUFFIX) - 1) - -#define INT8_MAX 127 -#define INT16_MAX 32767 -#define INT32_MAX 2147483647 -#define INT64_MAX (PASTE( 9223372036854775807, __STDINT_LONGLONG_SUFFIX)) - -#define UINT8_MAX 0xff /* 255U */ -#define UINT16_MAX 0xffff /* 65535U */ -#define UINT32_MAX 0xffffffff /* 4294967295U */ -#define UINT64_MAX (PASTE( 0xffffffffffffffffU, __STDINT_LONGLONG_SUFFIX)) /* 18446744073709551615ULL */ - -/* 7.18.2.2 Limits of minimum-width integer types */ -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST64_MIN INT64_MIN - -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MAX INT64_MAX - -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -/* 7.18.2.3 Limits of fastest minimum-width integer types */ -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST64_MIN INT64_MIN - -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MAX INT64_MAX - -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -/* 7.18.2.4 Limits of integer types capable of holding - object pointers */ -#ifdef _WIN64 -#define INTPTR_MIN INT64_MIN -#define INTPTR_MAX INT64_MAX -#define UINTPTR_MAX UINT64_MAX -#else -#define INTPTR_MIN INT32_MIN -#define INTPTR_MAX INT32_MAX -#define UINTPTR_MAX UINT32_MAX -#endif /* _WIN64 */ - -/* 7.18.2.5 Limits of greatest-width integer types */ -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -/* 7.18.3 Limits of other integer types */ -#define PTRDIFF_MIN INTPTR_MIN -#define PTRDIFF_MAX INTPTR_MAX - -#define SIG_ATOMIC_MIN INTPTR_MIN -#define SIG_ATOMIC_MAX INTPTR_MAX - -/* we need to check for SIZE_MAX already defined because MS defines it in limits.h */ -#ifndef SIZE_MAX -#define SIZE_MAX UINTPTR_MAX -#endif - -#ifndef WCHAR_MIN /* also in wchar.h */ -#define WCHAR_MIN 0 -#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */ -#endif - -/* - * wint_t is unsigned short for compatibility with MS runtime - */ -#define WINT_MIN 0 -#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */ - -#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */ - - -/* 7.18.4 Macros for integer constants */ -#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS) - -/* 7.18.4.1 Macros for minimum-width integer constants - - Accoding to Douglas Gwyn : -"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC -9899:1999 as initially published, the expansion was required -to be an integer constant of precisely matching type, which -is impossible to accomplish for the shorter types on most -platforms, because C99 provides no standard way to designate -an integer constant with width less than that of type int. -TC1 changed this to require just an integer constant -*expression* with *promoted* type." -*/ - -#define INT8_C(val) ((int8_t) + (val)) -#define UINT8_C(val) ((uint8_t) + (val##U)) -#define INT16_C(val) ((int16_t) + (val)) -#define UINT16_C(val) ((uint16_t) + (val##U)) - -#define INT32_C(val) val##L -#define UINT32_C(val) val##UL -#define INT64_C(val) (PASTE( val, __STDINT_LONGLONG_SUFFIX)) -#define UINT64_C(val)(PASTE( PASTE( val, U), __STDINT_LONGLONG_SUFFIX)) - -/* 7.18.4.2 Macros for greatest-width integer constants */ -#define INTMAX_C(val) INT64_C(val) -#define UINTMAX_C(val) UINT64_C(val) - -#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ - -#endif diff --git a/src/ddscxx/include/dds/core/xtypes/detail/Annotation.hpp b/src/ddscxx/include/dds/core/xtypes/detail/Annotation.hpp index 40cfe88..ce16d59 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/Annotation.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/Annotation.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_ANNOTATIONS_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_ANNOTATIONS_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/CollectionTypes.hpp b/src/ddscxx/include/dds/core/xtypes/detail/CollectionTypes.hpp index d07cfe3..6c4929a 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/CollectionTypes.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/CollectionTypes.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_COLLECTION_TYPES_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_COLLECTION_TYPES_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/DynamicData.hpp b/src/ddscxx/include/dds/core/xtypes/detail/DynamicData.hpp index 1576779..863b3df 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/DynamicData.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/DynamicData.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_TDYNAMICDATA_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_TDYNAMICDATA_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/DynamicType.hpp b/src/ddscxx/include/dds/core/xtypes/detail/DynamicType.hpp index bd3d88b..6c95578 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/DynamicType.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/DynamicType.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_DETAIL_XTYPES_DYNAMIC_TYPE_HPP_ #define OMG_DDS_CORE_DETAIL_XTYPES_DYNAMIC_TYPE_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/MemberType.hpp b/src/ddscxx/include/dds/core/xtypes/detail/MemberType.hpp index 2ccc69e..9ccb847 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/MemberType.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/MemberType.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_TMEMBER_TYPE_HPP #define OMG_DDS_CORE_XTYPES_DETAIL_TMEMBER_TYPE_HPP diff --git a/src/ddscxx/include/dds/core/xtypes/detail/PrimitiveTypes.hpp b/src/ddscxx/include/dds/core/xtypes/detail/PrimitiveTypes.hpp index a91581c..0db4e10 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/PrimitiveTypes.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/PrimitiveTypes.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_PRIMITIVE_TYPES_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_PRIMITIVE_TYPES_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/StructType.hpp b/src/ddscxx/include/dds/core/xtypes/detail/StructType.hpp index 29cdc45..bc88238 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/StructType.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/StructType.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_STRUCT_TYPE_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_STRUCT_TYPE_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/TypeProvider.hpp b/src/ddscxx/include/dds/core/xtypes/detail/TypeProvider.hpp index 87f5de1..efb0e8c 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/TypeProvider.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/TypeProvider.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_TYPE_PROVIDER_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_TYPE_PROVIDER_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/UnionCase.hpp b/src/ddscxx/include/dds/core/xtypes/detail/UnionCase.hpp index 07b8e55..0496359 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/UnionCase.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/UnionCase.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_UNION_CASE_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_UNION_CASE_HPP_ diff --git a/src/ddscxx/include/dds/core/xtypes/detail/UnionType.hpp b/src/ddscxx/include/dds/core/xtypes/detail/UnionType.hpp index 7fc7a6b..063df01 100644 --- a/src/ddscxx/include/dds/core/xtypes/detail/UnionType.hpp +++ b/src/ddscxx/include/dds/core/xtypes/detail/UnionType.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_CORE_XTYPES_DETAIL_UNION_TYPE_HPP_ #define OMG_DDS_CORE_XTYPES_DETAIL_UNION_TYPE_HPP_ diff --git a/src/ddscxx/include/dds/pub/detail/CoherentSet.hpp b/src/ddscxx/include/dds/pub/detail/CoherentSet.hpp index 5f8ad9f..d09e0f0 100644 --- a/src/ddscxx/include/dds/pub/detail/CoherentSet.hpp +++ b/src/ddscxx/include/dds/pub/detail/CoherentSet.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_PUB_DETAIL_COHERENT_SET_HPP_ #define OMG_DDS_PUB_DETAIL_COHERENT_SET_HPP_ diff --git a/src/ddscxx/include/dds/pub/detail/SuspendedPublication.hpp b/src/ddscxx/include/dds/pub/detail/SuspendedPublication.hpp index 5c9fc04..23e82c3 100644 --- a/src/ddscxx/include/dds/pub/detail/SuspendedPublication.hpp +++ b/src/ddscxx/include/dds/pub/detail/SuspendedPublication.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_PUB_DETAIL_SUSPENDED_PUBLICATION_HPP_ #define OMG_DDS_PUB_DETAIL_SUSPENDED_PUBLICATION_HPP_ diff --git a/src/ddscxx/include/dds/sub/cond/detail/ReadCondition.hpp b/src/ddscxx/include/dds/sub/cond/detail/ReadCondition.hpp index 50291fd..97326b5 100644 --- a/src/ddscxx/include/dds/sub/cond/detail/ReadCondition.hpp +++ b/src/ddscxx/include/dds/sub/cond/detail/ReadCondition.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_READ_CONDITION_HPP_ #define OMG_DDS_SUB_DETAIL_READ_CONDITION_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/CoherentAccess.hpp b/src/ddscxx/include/dds/sub/detail/CoherentAccess.hpp index 207485e..4a90e1a 100644 --- a/src/ddscxx/include/dds/sub/detail/CoherentAccess.hpp +++ b/src/ddscxx/include/dds/sub/detail/CoherentAccess.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_COHERENT_ACCESS_HPP_ #define OMG_DDS_SUB_DETAIL_COHERENT_ACCESS_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/DataReader.hpp b/src/ddscxx/include/dds/sub/detail/DataReader.hpp index 5d84174..6842f5a 100644 --- a/src/ddscxx/include/dds/sub/detail/DataReader.hpp +++ b/src/ddscxx/include/dds/sub/detail/DataReader.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_DATA_READER_HPP_ #define OMG_DDS_SUB_DETAIL_DATA_READER_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/GenerationCount.hpp b/src/ddscxx/include/dds/sub/detail/GenerationCount.hpp index f7d097e..7d90f5a 100644 --- a/src/ddscxx/include/dds/sub/detail/GenerationCount.hpp +++ b/src/ddscxx/include/dds/sub/detail/GenerationCount.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_GENERATION_COUNT_HPP_ #define OMG_DDS_SUB_DETAIL_GENERATION_COUNT_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/LoanedSamples.hpp b/src/ddscxx/include/dds/sub/detail/LoanedSamples.hpp index 7ca5d82..ea30d7f 100644 --- a/src/ddscxx/include/dds/sub/detail/LoanedSamples.hpp +++ b/src/ddscxx/include/dds/sub/detail/LoanedSamples.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_SUB_DETAIL_LOANED_SAMPLES_IMPL_HPP_ #define OMG_SUB_DETAIL_LOANED_SAMPLES_IMPL_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/Query.hpp b/src/ddscxx/include/dds/sub/detail/Query.hpp index b0c988b..aaeb13f 100644 --- a/src/ddscxx/include/dds/sub/detail/Query.hpp +++ b/src/ddscxx/include/dds/sub/detail/Query.hpp @@ -1,8 +1,13 @@ /* - * Query.hpp + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * Created on: Oct 10, 2012 - * Author: angelo + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ #ifndef DDS_SUB_DETAIL_QUERY_HPP_ diff --git a/src/ddscxx/include/dds/sub/detail/Rank.hpp b/src/ddscxx/include/dds/sub/detail/Rank.hpp index 21aba67..a7690db 100644 --- a/src/ddscxx/include/dds/sub/detail/Rank.hpp +++ b/src/ddscxx/include/dds/sub/detail/Rank.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_RANK_HPP #define OMG_DDS_SUB_DETAIL_RANK_HPP diff --git a/src/ddscxx/include/dds/sub/detail/SampleInfo.hpp b/src/ddscxx/include/dds/sub/detail/SampleInfo.hpp index 60f3a7e..39fd81c 100644 --- a/src/ddscxx/include/dds/sub/detail/SampleInfo.hpp +++ b/src/ddscxx/include/dds/sub/detail/SampleInfo.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef OMG_DDS_SUB_DETAIL_SAMPLE_INFO_HPP_ #define OMG_DDS_SUB_DETAIL_SAMPLE_INFO_HPP_ diff --git a/src/ddscxx/include/dds/topic/detail/Filter.hpp b/src/ddscxx/include/dds/topic/detail/Filter.hpp index 05ca596..889c4d4 100644 --- a/src/ddscxx/include/dds/topic/detail/Filter.hpp +++ b/src/ddscxx/include/dds/topic/detail/Filter.hpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #ifndef DDS_TOPIC_DETAIL_QUERY_HPP_ #define DDS_TOPIC_DETAIL_QUERY_HPP_ diff --git a/src/ddscxx/include/org/eclipse/cyclonedds/pub/PublisherDelegate.hpp b/src/ddscxx/include/org/eclipse/cyclonedds/pub/PublisherDelegate.hpp index 7c837c8..9dcb3a5 100644 --- a/src/ddscxx/include/org/eclipse/cyclonedds/pub/PublisherDelegate.hpp +++ b/src/ddscxx/include/org/eclipse/cyclonedds/pub/PublisherDelegate.hpp @@ -18,24 +18,6 @@ #ifndef OMG_IDDS_PUB_PUBLISHER_DELEGATE_HPP_ #define OMG_IDDS_PUB_PUBLISHER_DELEGATE_HPP_ -/* Copyright 2010, Object Management Group, Inc. - * Copyright 2010, PrismTech, Corp. - * Copyright 2010, Real-Time Innovations, Inc. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - #include #include #include diff --git a/src/ddscxx/include/org/eclipse/cyclonedds/sub/AnyDataReaderDelegate.hpp b/src/ddscxx/include/org/eclipse/cyclonedds/sub/AnyDataReaderDelegate.hpp index 6046066..95dcaf6 100644 --- a/src/ddscxx/include/org/eclipse/cyclonedds/sub/AnyDataReaderDelegate.hpp +++ b/src/ddscxx/include/org/eclipse/cyclonedds/sub/AnyDataReaderDelegate.hpp @@ -18,24 +18,6 @@ #ifndef CYCLONEDDS_SUB_ANY_DATA_READER_DELEGATE_HPP_ #define CYCLONEDDS_SUB_ANY_DATA_READER_DELEGATE_HPP_ -/* Copyright 2010, Object Management Group, Inc. - * Copyright 2010, PrismTech, Corp. - * Copyright 2010, Real-Time Innovations, Inc. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - #include #include #include diff --git a/src/ddscxx/src/dds/domain/discovery.cpp b/src/ddscxx/src/dds/domain/discovery.cpp index 445e49a..0c3f2b9 100644 --- a/src/ddscxx/src/dds/domain/discovery.cpp +++ b/src/ddscxx/src/dds/domain/discovery.cpp @@ -1,23 +1,14 @@ /* -* Vortex OpenSplice -* - * This software and documentation are Copyright 2006 to TO_YEAR ADLINK - * Technology Limited, its affiliated companies and licensors. All rights - * reserved. + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -* -*/ + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ /** diff --git a/src/ddscxx/src/dds/domain/find.cpp b/src/ddscxx/src/dds/domain/find.cpp index 67e0892..78cc8c8 100644 --- a/src/ddscxx/src/dds/domain/find.cpp +++ b/src/ddscxx/src/dds/domain/find.cpp @@ -1,23 +1,14 @@ /* -* Vortex OpenSplice -* - * This software and documentation are Copyright 2006 to TO_YEAR ADLINK - * Technology Limited, its affiliated companies and licensors. All rights - * reserved. + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -* -*/ + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ /** diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/core/cond/ConditionDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/core/cond/ConditionDelegate.cpp index aa26ae4..31055dd 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/core/cond/ConditionDelegate.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/core/cond/ConditionDelegate.cpp @@ -1,4 +1,14 @@ - +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/sub/QueryDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/sub/QueryDelegate.cpp index dfce878..ac96623 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/sub/QueryDelegate.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/sub/QueryDelegate.cpp @@ -1,23 +1,14 @@ /* -* Vortex OpenSplice -* - * This software and documentation are Copyright 2006 to TO_YEAR ADLINK - * Technology Limited, its affiliated companies and licensors. All rights - * reserved. + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -* -*/ + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ /** diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/QueryConditionDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/QueryConditionDelegate.cpp index 7c9f3c3..8f21af6 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/QueryConditionDelegate.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/QueryConditionDelegate.cpp @@ -1,4 +1,14 @@ - +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/ReadConditionDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/ReadConditionDelegate.cpp index 50efa42..e583824 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/ReadConditionDelegate.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/sub/cond/ReadConditionDelegate.cpp @@ -1,21 +1,13 @@ /* - * Vortex OpenSplice + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * This software and documentation are Copyright 2006 to TO_YEAR ADLINK - * Technology Limited, its affiliated companies and licensors. All rights - * reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/topic/FilterDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/topic/FilterDelegate.cpp index 3eee8f8..a70600a 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/topic/FilterDelegate.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/topic/FilterDelegate.cpp @@ -1,13 +1,13 @@ /* - * OpenSplice DDS + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * This software and documentation are Copyright 2006 to 2015 PrismTech - * Limited and its licensees. All rights reserved. See file: - * - * $OSPL_HOME/LICENSE - * - * for full copyright notice and license terms. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ /** * @file diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/topic/find.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/topic/find.cpp index 145e354..f6c9c1f 100644 --- a/src/ddscxx/src/org/eclipse/cyclonedds/topic/find.cpp +++ b/src/ddscxx/src/org/eclipse/cyclonedds/topic/find.cpp @@ -1,21 +1,13 @@ /* - * Vortex OpenSplice + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others * - * This software and documentation are Copyright 2006 to TO_YEAR ADLINK - * Technology Limited, its affiliated companies and licensors. All rights - * reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause */ #include diff --git a/src/ddscxx/tests/EntityStatus.cpp b/src/ddscxx/tests/EntityStatus.cpp index a9026a0..7e01fa3 100644 --- a/src/ddscxx/tests/EntityStatus.cpp +++ b/src/ddscxx/tests/EntityStatus.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/ddscxx/tests/ListenerSetup.cpp b/src/ddscxx/tests/ListenerSetup.cpp index f5b1cf7..0368937 100644 --- a/src/ddscxx/tests/ListenerSetup.cpp +++ b/src/ddscxx/tests/ListenerSetup.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include "dds/dds.hpp" #include "dds/ddscxx/test.h" diff --git a/src/ddscxx/tests/ListenerStress.cpp b/src/ddscxx/tests/ListenerStress.cpp index bb568f2..acd2f6e 100644 --- a/src/ddscxx/tests/ListenerStress.cpp +++ b/src/ddscxx/tests/ListenerStress.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/ddscxx/tests/ListenerTrigger.cpp b/src/ddscxx/tests/ListenerTrigger.cpp index 7927bdc..d113ccb 100644 --- a/src/ddscxx/tests/ListenerTrigger.cpp +++ b/src/ddscxx/tests/ListenerTrigger.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/ddscxx/tests/data/HelloWorldData.idl b/src/ddscxx/tests/data/HelloWorldData.idl index 25033bd..b5a00a1 100644 --- a/src/ddscxx/tests/data/HelloWorldData.idl +++ b/src/ddscxx/tests/data/HelloWorldData.idl @@ -1,3 +1,15 @@ +/** + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ + /** * @addtogroup examplesdcpsHelloWorldisocpp */ diff --git a/src/ddscxx/tests/data/Space.idl b/src/ddscxx/tests/data/Space.idl index c1973a3..d1d5636 100644 --- a/src/ddscxx/tests/data/Space.idl +++ b/src/ddscxx/tests/data/Space.idl @@ -1,4 +1,14 @@ - +/** + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ module Space { enum Enumeration { diff --git a/src/examples/helloworld/HelloWorldData.idl b/src/examples/helloworld/HelloWorldData.idl index 0061d60..eff970a 100644 --- a/src/examples/helloworld/HelloWorldData.idl +++ b/src/examples/helloworld/HelloWorldData.idl @@ -1,9 +1,20 @@ -module HelloWorldData -{ - struct Msg - { - long userID; - string message; - }; - #pragma keylist Msg userID -}; +/** + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ +module HelloWorldData +{ + struct Msg + { + long userID; + string message; + }; + #pragma keylist Msg userID +}; diff --git a/src/examples/helloworld/publisher.cpp b/src/examples/helloworld/publisher.cpp index 6a1cd3f..62070ad 100644 --- a/src/examples/helloworld/publisher.cpp +++ b/src/examples/helloworld/publisher.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include diff --git a/src/examples/helloworld/subscriber.cpp b/src/examples/helloworld/subscriber.cpp index 61f881f..6ea5c1a 100644 --- a/src/examples/helloworld/subscriber.cpp +++ b/src/examples/helloworld/subscriber.cpp @@ -1,3 +1,14 @@ +/* + * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License + * v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause + */ #include #include