Skip to content

Commit d4b41b8

Browse files
authored
Merge pull request #750 from ManuelJNunez/feature/JH-396
JH-396: merge release/7.6.0 into master
2 parents 19d2357 + e4dbdee commit d4b41b8

File tree

157 files changed

+1320
-389
lines changed

Some content is hidden

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

157 files changed

+1320
-389
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pipeline {
4040
)
4141
)
4242
// Set a timeout for the entire pipeline
43-
timeout(time: 2, unit: 'HOURS')
43+
timeout(time: 3, unit: 'HOURS')
4444
}
4545

4646
stages {

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ git submodule update --init --recursive
2424
## Versioning
2525

2626
The examples contained in this branch were built and tested against **RTI Connext
27-
7.5.0**. If you need examples that have been built and tested against previous
27+
7.6.0**. If you need examples that have been built and tested against previous
2828
versions of RTI Connext, please check out the corresponding release branch:
2929

30+
- [release/7.5.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.5.0)
3031
- [release/7.4.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.4.0)
3132
- [release/7.3.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.3.0)
3233
- [release/7.2.0](https://github.com/rticommunity/rticonnextdds-examples/tree/release/7.2.0)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.5.0
1+
7.6.0

examples/connext_dds/asynchronous_publication/c++11/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,20 @@ using CMake, please refer to the
135135
[hello_world](../../../connext_dds/build_systems/cmake/) example, which includes
136136
a comprehensive `CMakeLists.txt` script with all the steps and instructions
137137
described in detail.
138+
139+
140+
## Troubleshooting
141+
142+
### Compilation fails accessing struct field
143+
144+
If the code compilation fails with errors such as "reference to non-static member
145+
function must be called" for code such as `my_sample.my_field = value` or
146+
`value = my_sample.my_field` this means that the rtiddsgen version you are using
147+
doesn't have the IDL4 C++ mapping enabled by default.
148+
149+
To fix it, upgrade your Connext version to 7.6+ or check out the branch for the
150+
Connext version you're using, e.g.
151+
152+
```sh
153+
git checkout release/7.3.0
154+
```

examples/connext_dds/asynchronous_publication/c++11/async_publisher.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void run_publisher_application(
7777
std::cout << "Writing async, count " << samples_written << std::endl;
7878

7979
// Send count as data
80-
instance.x(samples_written);
80+
instance.x = samples_written;
8181

8282
// Send it, if using instance_handle:
8383
// writer.write(instance, instance_handle);

examples/connext_dds/asynchronous_publication/c++11/async_subscriber.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int process_data(dds::sub::DataReader<async> reader)
3333
double elapsed_ticks = clock() - InitTime;
3434
double elapsed_secs = elapsed_ticks / CLOCKS_PER_SEC;
3535
std::cout << "@ t=" << elapsed_secs << "s"
36-
<< ", got x = " << sample.data().x() << std::endl;
36+
<< ", got x = " << sample.data().x << std::endl;
3737
} else {
3838
std::cout << "Instance state changed to "
3939
<< sample.info().state().instance_state() << std::endl;

examples/connext_dds/asynchronous_publication/cs/AsyncPublicationExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.5.0" />
9+
<PackageReference Include="Rti.ConnextDds.Extra" Version="7.6.0" />
1010
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1"/>
1111
</ItemGroup>
1212

examples/connext_dds/asyncwaitset/c++11/AwsExample_publisher.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ AwsPublisher::AwsPublisher(
9292
dds::pub::Publisher(participant),
9393
topic);
9494
// set sample key value:
95-
sample_.key(publisher_id);
95+
sample_.key = publisher_id;
9696

9797

9898
// Send condition: to generate application-driven events to send samples
@@ -107,8 +107,8 @@ void AwsPublisher::generate_send_event()
107107

108108
void AwsPublisher::send_sample()
109109
{
110-
std::cout << "Send Sample: " << sample_.number() << std::endl;
111-
sample_.number(sample_.number() + 1);
110+
std::cout << "Send Sample: " << sample_.number << std::endl;
111+
sample_.number = sample_.number + 1;
112112
sender_.write(sample_);
113113
}
114114

examples/connext_dds/asyncwaitset/c++11/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,20 @@ using CMake, please refer to the
184184
[hello_world](../../../connext_dds/build_systems/cmake/) example, which includes
185185
a comprehensive `CMakeLists.txt` script with all the steps and instructions
186186
described in detail.
187+
188+
189+
## Troubleshooting
190+
191+
### Compilation fails accessing struct field
192+
193+
If the code compilation fails with errors such as "reference to non-static member
194+
function must be called" for code such as `my_sample.my_field = value` or
195+
`value = my_sample.my_field` this means that the rtiddsgen version you are using
196+
doesn't have the IDL4 C++ mapping enabled by default.
197+
198+
To fix it, upgrade your Connext version to 7.6+ or check out the branch for the
199+
Connext version you're using, e.g.
200+
201+
```sh
202+
git checkout release/7.3.0
203+
```

examples/connext_dds/batching/c++11/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,20 @@ using CMake, please refer to the
139139
[hello_world](../../../connext_dds/build_systems/cmake/) example, which includes
140140
a comprehensive CMakeLists.txt script with all the steps and instructions
141141
described in detail.
142+
143+
144+
## Troubleshooting
145+
146+
### Compilation fails accessing struct field
147+
148+
If the code compilation fails with errors such as "reference to non-static member
149+
function must be called" for code such as `my_sample.my_field = value` or
150+
`value = my_sample.my_field` this means that the rtiddsgen version you are using
151+
doesn't have the IDL4 C++ mapping enabled by default.
152+
153+
To fix it, upgrade your Connext version to 7.6+ or check out the branch for the
154+
Connext version you're using, e.g.
155+
156+
```sh
157+
git checkout release/7.3.0
158+
```

0 commit comments

Comments
 (0)