Skip to content

Commit 563b82c

Browse files
mitza-ocimitza-oci
committed
Merge branch 'v4' into v4-gtest
2 parents 48dd49a + 0aaf816 commit 563b82c

File tree

160 files changed

+3560
-1704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+3560
-1704
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 63 additions & 39 deletions
Large diffs are not rendered by default.

‎.github/workflows/docker_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4545

4646
- name: Build and push Docker image
47-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1
47+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
4848
with:
4949
context: .
5050
push: true

‎acetao.ini‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@
55
[ace6tao2]
66
hold=0
77
desc=ACE 6/TAO 2
8-
version=6.5.21
8+
version=6.5.22
99
repo=https://github.com/DOCGroup/ACE_TAO.git
1010
branch=ace6tao2
11-
url=https://github.com/DOCGroup/ACE_TAO/releases/tag/ACE%2BTAO-6_5_21
12-
zip-filename=ACE+TAO-src-6.5.21.zip
13-
zip-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_21/ACE%2BTAO-src-6.5.21.zip
14-
zip-md5=6c3f14102768819c2082273be309e366
15-
tar.gz-filename=ACE+TAO-src-6.5.21.tar.gz
16-
tar.gz-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_21/ACE%2BTAO-src-6.5.21.tar.gz
17-
tar.gz-md5=c8b028c4d6b253d35dddf01332d7de10
18-
tar.bz2-filename=ACE+TAO-src-6.5.21.tar.bz2
19-
tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_21/ACE%2BTAO-src-6.5.21.tar.bz2
20-
tar.bz2-md5=7b04201352aefa4cdd3938adef86cde6
11+
url=https://github.com/DOCGroup/ACE_TAO/releases/tag/ACE%2BTAO-6_5_22
12+
zip-filename=ACE+TAO-src-6.5.22.zip
13+
zip-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_22/ACE%2BTAO-src-6.5.22.zip
14+
zip-md5=130989e89ad520e175775beeb7aff204
15+
tar.gz-filename=ACE+TAO-src-6.5.22.tar.gz
16+
tar.gz-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_22/ACE%2BTAO-src-6.5.22.tar.gz
17+
tar.gz-md5=59bac48d1be8f2ae168c7c0951243af1
18+
tar.bz2-filename=ACE+TAO-src-6.5.22.tar.bz2
19+
tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_22/ACE%2BTAO-src-6.5.22.tar.bz2
20+
tar.bz2-md5=82b0c0ac9efcbabd287885792e7c4c7a
2121

2222
[ace8tao4]
2323
hold=0
2424
desc=ACE 8/TAO 4
25-
version=8.0.3
25+
version=8.0.4
2626
repo=https://github.com/DOCGroup/ACE_TAO.git
2727
branch=master
28-
url=https://github.com/DOCGroup/ACE_TAO/releases/tag/ACE%2BTAO-8_0_3
29-
zip-filename=ACE+TAO-src-8.0.3.zip
30-
zip-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_3/ACE%2BTAO-src-8.0.3.zip
31-
zip-md5=7aaf13fed812cfffe72197c0cbb8f8fc
32-
tar.gz-filename=ACE+TAO-src-8.0.3.tar.gz
33-
tar.gz-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_3/ACE%2BTAO-src-8.0.3.tar.gz
34-
tar.gz-md5=78d39f2f062ad23da46ec3e92f298fc6
35-
tar.bz2-filename=ACE+TAO-src-8.0.3.tar.bz2
36-
tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_3/ACE%2BTAO-src-8.0.3.tar.bz2
37-
tar.bz2-md5=1890ef8c9a3ad5e99ac801cb0dc786d9
28+
url=https://github.com/DOCGroup/ACE_TAO/releases/tag/ACE%2BTAO-8_0_4
29+
zip-filename=ACE+TAO-src-8.0.4.zip
30+
zip-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_4/ACE%2BTAO-src-8.0.4.zip
31+
zip-md5=a765baa1fe54f960f8ce365f8ef3cfc0
32+
tar.gz-filename=ACE+TAO-src-8.0.4.tar.gz
33+
tar.gz-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_4/ACE%2BTAO-src-8.0.4.tar.gz
34+
tar.gz-md5=5b05bbdcda1ead2dadc49e14f216d6dd
35+
tar.bz2-filename=ACE+TAO-src-8.0.4.tar.bz2
36+
tar.bz2-url=https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_4/ACE%2BTAO-src-8.0.4.tar.bz2
37+
tar.bz2-md5=e8b13de0fa3ca20d35321f26f7f4ddc0

‎cmake/dds_idl_sources.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function(_opendds_target_idl_sources target)
2020
SKIP_OPENDDS_IDL
2121
AUTO_INCLUDES
2222
INCLUDE_BASE
23+
FOLDER
2324
)
2425
set(multi_value_args TAO_IDL_FLAGS DDS_IDL_FLAGS IDL_FILES)
2526
cmake_parse_arguments(arg "" "${one_value_args}" "${multi_value_args}" ${ARGN})
@@ -274,6 +275,7 @@ function(_opendds_target_idl_sources target)
274275
set_target_properties(${target} PROPERTIES _OPENDDS_IDL_FILE_COUNT ${idl_file_count})
275276
set(idl_target "_opendds_codegen_${idl_file_count}_for_${target}")
276277
add_custom_target(${idl_target} DEPENDS ${generated_files})
278+
set_target_properties(${idl_target} PROPERTIES FOLDER ${arg_FOLDER})
277279
add_dependencies(${target} ${idl_target})
278280

279281
set_source_files_properties(${idl_files} ${h_files}

‎cmake/init.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ option(OPENDDS_AUTO_LINK_DCPS
594594
# TODO: Make this default ON in v4.0
595595
option(OPENDDS_USE_CORRECT_INCLUDE_SCOPE
596596
"Include using SCOPE specified in opendds_target_sources" OFF)
597+
set(OPENDDS_DEFAULT_GENERATED_FOLDER "IDL" CACHE STRING
598+
"Default value used for the FOLDER CMake property of generated targets added in opendds_target_sources")
597599

598600
if(OPENDDS_STATIC)
599601
set(OPENDDS_LIBRARY_TYPE STATIC)

‎cmake/opendds_group.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ _opendds_group(OpenDDS DEFAULT_REQUIRED OpenDDS::Dcps OpenDDS::opendds_idl)
1616
_opendds_group_lib(Dcps
1717
DEPENDS
1818
ACE::ACE
19-
TAO::TAO
2019
# TODO: These are omitted with safety profile
20+
TAO::TAO
2121
TAO::Valuetype
2222
TAO::PortableServer
2323
TAO::BiDirGIOP
@@ -27,6 +27,7 @@ _opendds_group_lib(Federator DEPENDS OpenDDS::InfoRepoLib)
2727
_opendds_group_lib(InfoRepoDiscovery
2828
DEPENDS
2929
OpenDDS::Dcps
30+
OpenDDS::Tcp
3031
TAO::PortableServer
3132
TAO::BiDirGIOP
3233
TAO::PI

‎cmake/opendds_target_sources.cmake‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ function(_opendds_get_sources_and_options
2424
auto_link
2525
include_base
2626
skip_tao_idl
27-
skip_opendds_idl)
27+
skip_opendds_idl
28+
folder)
2829
set(no_value_options
2930
SKIP_TAO_IDL
3031
SKIP_OPENDDS_IDL
@@ -36,6 +37,7 @@ function(_opendds_get_sources_and_options
3637
GENERATE_SERVER_SKELETONS
3738
AUTO_LINK
3839
INCLUDE_BASE
40+
FOLDER
3941
)
4042
set(multi_value_options
4143
PUBLIC PRIVATE INTERFACE
@@ -127,6 +129,11 @@ function(_opendds_get_sources_and_options
127129
endif()
128130
set(${auto_link} ${arg_AUTO_LINK} PARENT_SCOPE)
129131

132+
if(NOT DEFINED arg_FOLDER)
133+
set(arg_FOLDER ${OPENDDS_DEFAULT_GENERATED_FOLDER})
134+
endif()
135+
set(${folder} ${arg_FOLDER} PARENT_SCOPE)
136+
130137
set(all_idl_files)
131138
foreach(scope PUBLIC PRIVATE INTERFACE)
132139
set(idl_sources ${idl_sources_${scope}})
@@ -224,6 +231,7 @@ function(opendds_target_sources target)
224231
include_base
225232
skip_tao_idl
226233
skip_opendds_idl
234+
folder
227235
${ARGN})
228236

229237
if(NOT opendds_options MATCHES "--(no-)?default-nested")
@@ -331,7 +339,8 @@ function(opendds_target_sources target)
331339
SCOPE ${scope}
332340
INCLUDE_BASE "${include_base}"
333341
AUTO_INCLUDES auto_includes
334-
USE_EXPORT ${use_export})
342+
USE_EXPORT ${use_export}
343+
FOLDER ${folder})
335344
list(APPEND includes ${auto_includes})
336345
endif()
337346

‎dds/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -607,26 +607,27 @@ opendds_target_sources(OpenDDS_Dcps
607607
PUBLIC
608608
DdsDcps.idl
609609
DdsDcpsConditionSeq.idl # TODO
610-
DdsDcpsCore.idl # TODO
611610
DdsDcpsDataReaderSeq.idl # TODO
612611
DdsDcpsDomain.idl
613-
DdsDcpsGuid.idl # TODO
614-
DdsDcpsInfoUtils.idl # TODO
615-
DdsDcpsInfrastructure.idl
616612
DdsDcpsPublication.idl
617613
DdsDcpsSubscription.idl
618614
DdsDcpsSubscriptionExt.idl
619615
DdsDcpsTopic.idl
620616
DdsDcpsTypeSupportExt.idl
621-
DdsSecurityCore.idl # TODO
622-
DdsSecurityParams.idl # TODO
623-
OpenddsDcpsExt.idl # TODO
624617
${opendds_target_sources_args}
618+
SKIP_OPENDDS_IDL
625619
)
626620

627621
opendds_target_sources(OpenDDS_Dcps
628622
PUBLIC
623+
DdsDcpsCore.idl # TODO
624+
DdsDcpsGuid.idl # TODO
625+
DdsDcpsInfrastructure.idl
626+
DdsDcpsInfoUtils.idl # TODO
629627
DdsDynamicDataSeq.idl
628+
DdsSecurityCore.idl # TODO
629+
DdsSecurityParams.idl # TODO
630+
OpenddsDcpsExt.idl # TODO
630631
${opendds_target_sources_args}
631632
)
632633

@@ -638,6 +639,7 @@ opendds_target_sources(OpenDDS_Dcps
638639
DdsDynamicTypeSupport.idl
639640
TAO_IDL_OPTIONS -Scdr -Sa
640641
${opendds_target_sources_args}
642+
SKIP_OPENDDS_IDL
641643
)
642644

643645
opendds_install_interface_files(OpenDDS_Dcps INCLUDE_BASE "${OPENDDS_SOURCE_DIR}")

‎dds/CORBA/tao/String_Alloc.cpp‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,33 @@
99

1010
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
1111

12-
char *
13-
CORBA::string_dup (const char *str)
12+
char*
13+
CORBA::string_dup(const char* str)
1414
{
15-
if (!str)
16-
{
17-
errno = EINVAL;
18-
return 0;
19-
}
15+
if (!str) {
16+
errno = EINVAL;
17+
return 0;
18+
}
2019

21-
size_t const len = ACE_OS::strlen (str);
20+
const size_t len = ACE_OS::strlen(str);
2221

2322
// This allocates an extra byte for the '\0';
24-
char * copy = CORBA::string_alloc (static_cast<CORBA::ULong> (len));
23+
char* copy = CORBA::string_alloc(static_cast<CORBA::ULong>(len));
2524

26-
if (copy != 0)
27-
{
28-
// The memcpy() assumes that the destination is a valid buffer.
29-
ACE_OS::memcpy (copy, str, len + 1);
30-
}
25+
if (copy) {
26+
ACE_OS::memcpy(copy, str, len + 1);
27+
}
3128

3229
return copy;
3330
}
3431

35-
char *
36-
CORBA::string_alloc (CORBA::ULong len)
32+
char*
33+
CORBA::string_alloc(CORBA::ULong len)
3734
{
3835
// Allocate 1 + strlen to accommodate the null terminating character.
39-
char *s = 0;
36+
char* s = 0;
4037
ACE_ALLOCATOR_NEW (s,
41-
char[size_t (len + 1)],
38+
char[len + 1],
4239
0);
4340

4441
s[0]= '\0';
@@ -47,49 +44,46 @@ CORBA::string_alloc (CORBA::ULong len)
4744
}
4845

4946
void
50-
CORBA::string_free (char *str)
47+
CORBA::string_free(char* str)
5148
{
52-
ACE_Allocator::instance ()->free (str);
49+
ACE_Allocator::instance()->free(str);
5350
}
5451

5552
// ****************************************************************
5653

5754
CORBA::WChar*
58-
CORBA::wstring_dup (const WChar *const str)
55+
CORBA::wstring_dup(const WChar* str)
5956
{
60-
if (!str)
61-
{
62-
errno = EINVAL;
63-
return 0;
64-
}
57+
if (!str) {
58+
errno = EINVAL;
59+
return 0;
60+
}
6561

6662
CORBA::WChar* retval =
67-
CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str)));
63+
CORBA::wstring_alloc(static_cast<CORBA::ULong>(ACE_OS::strlen(str)));
6864

69-
// The wscpy() below assumes that the destination is a valid buffer.
70-
if (retval == 0)
71-
{
72-
return 0;
73-
}
65+
if (!retval) {
66+
return 0;
67+
}
7468

75-
return ACE_OS::wscpy (retval, str);
69+
return ACE_OS::wscpy(retval, str);
7670
}
7771

7872
CORBA::WChar*
79-
CORBA::wstring_alloc (CORBA::ULong len)
73+
CORBA::wstring_alloc(CORBA::ULong len)
8074
{
81-
CORBA::WChar *s = 0;
75+
CORBA::WChar* s = 0;
8276
ACE_ALLOCATOR_NEW (s,
83-
CORBA::WChar [(size_t) (len + 1)],
77+
CORBA::WChar[len + 1],
8478
0);
8579

8680
return s;
8781
}
8882

8983
void
90-
CORBA::wstring_free (CORBA::WChar *const str)
84+
CORBA::wstring_free(CORBA::WChar* str)
9185
{
92-
ACE_Allocator::instance ()->free(str);
86+
ACE_Allocator::instance()->free(str);
9387
}
9488

9589
TAO_END_VERSIONED_NAMESPACE_DECL

‎dds/CORBA/tao/SystemException.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ CORBA::SystemException::_tao_errno (int errno_value)
162162
#endif /* ENOSYS != EFAULT */
163163
default:
164164
// Mask off bottom 7 bits and return them.
165-
return errno_value & 0x7FU;
165+
return static_cast<CORBA::ULong>(errno_value & 0x7FU);
166166
}
167167
}
168168

@@ -345,10 +345,10 @@ CORBA::SystemException::_info (void) const
345345
default:
346346
{
347347
// 7 bits of some other errno.
348-
ACE_OS::snprintf (unknown_errno,
348+
ACE_OS::snprintf(unknown_errno,
349349
255,
350350
"low 7 bits of errno: %3u %s",
351-
minor_code, ACE_OS::strerror (minor_code));
351+
minor_code, ACE_OS::strerror(static_cast<int>(minor_code)));
352352

353353
errno_indication = unknown_errno;
354354
}
@@ -835,10 +835,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL
835835
TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
836836

837837
static const char *repo_id_array[] = {
838-
#define TAO_SYSTEM_EXCEPTION(name) \
839-
(char *) "IDL:omg.org/CORBA/" #name ":1.0",
840-
STANDARD_EXCEPTION_LIST
841-
#undef TAO_SYSTEM_EXCEPTION
838+
#define TAO_SYSTEM_EXCEPTION(name) "IDL:omg.org/CORBA/" #name ":1.0",
839+
STANDARD_EXCEPTION_LIST
840+
#undef TAO_SYSTEM_EXCEPTION
842841
0
843842
};
844843

0 commit comments

Comments
 (0)