diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx index fc1cdd916e3..9a74345f880 100644 --- a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx +++ b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.cxx @@ -85,6 +85,11 @@ bool AdvancedConfigurationPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/Configurability/samplePubSubTypes.cxx b/examples/cpp/dds/Configurability/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/Configurability/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Configurability/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx index ce688064a0e..213dd3174e3 100644 --- a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx +++ b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.cxx @@ -83,6 +83,11 @@ bool TopicPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx index ffd0e7faa97..e875f85fd76 100644 --- a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx +++ b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.cxx @@ -83,6 +83,11 @@ bool CustomPayloadPoolDataPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx index 300ac806538..e917aaf7da1 100644 --- a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx +++ b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloMsgPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx b/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx index ce688064a0e..213dd3174e3 100644 --- a/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx +++ b/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.cxx @@ -83,6 +83,11 @@ bool TopicPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx b/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx index be0bd937a6b..afeb1a7e011 100644 --- a/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx +++ b/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool FilteringExamplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.h b/examples/cpp/dds/FlowControlExample/FlowControlExample.h index f73d6e41c08..d68406cb810 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExample.h +++ b/examples/cpp/dds/FlowControlExample/FlowControlExample.h @@ -183,7 +183,7 @@ class FlowControlExample private: - std::array m_message; + std::array m_message{0}; char m_wasFast{0}; }; diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx index 1d375cfbfe3..33d8b43583a 100644 --- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx +++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool FlowControlExamplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h index deb44d359b1..1fa4522175d 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h @@ -212,7 +212,7 @@ class HelloWorld uint32_t m_index{0}; std::string m_message; - std::array m_data; + std::array m_data{0}; }; diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx b/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx +++ b/examples/cpp/dds/HistoryKind/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx +++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx b/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx +++ b/examples/cpp/dds/LateJoiners/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx b/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx index 05b7ea5970c..b3f9c02d764 100644 --- a/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx +++ b/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.cxx @@ -83,6 +83,11 @@ bool LifespanPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx b/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx index ce688064a0e..213dd3174e3 100644 --- a/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx +++ b/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.cxx @@ -83,6 +83,11 @@ bool TopicPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx index 279bcd498c4..b5f9f7e0bef 100644 --- a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx +++ b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.cxx @@ -83,6 +83,11 @@ bool ExampleMessagePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx index e928e28c98d..f36c98fa1b2 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx +++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx @@ -83,6 +83,11 @@ bool RequestTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -273,6 +278,11 @@ bool ReplyTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h index ae4b2b39e8d..0b71ce89df0 100644 --- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h +++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h @@ -93,7 +93,7 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED diff --git a/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx +++ b/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx +++ b/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx b/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx index 9095d77083a..fca095e8bd4 100644 --- a/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx +++ b/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.cxx @@ -83,6 +83,11 @@ bool samplePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx index 85cb477896e..28f6913f823 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx index 668ff484ea0..7868c7052a2 100644 --- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool LoanableHelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx index 668ff484ea0..7868c7052a2 100644 --- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx +++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool LoanableHelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx index f43bd3147b2..3eaeae00b91 100644 --- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx @@ -88,6 +88,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -278,6 +283,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -468,6 +478,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -662,6 +677,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -852,6 +872,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1042,6 +1067,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1243,6 +1273,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx index 5d92b732491..4f5d8a9f3ef 100644 --- a/src/cpp/statistics/types/typesPubSubTypes.cxx +++ b/src/cpp/statistics/types/typesPubSubTypes.cxx @@ -87,6 +87,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -277,6 +282,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -467,6 +477,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -657,6 +672,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -847,6 +867,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1037,6 +1062,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1230,6 +1260,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1420,6 +1455,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1610,6 +1650,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1800,6 +1845,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1990,6 +2040,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2180,6 +2235,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2370,6 +2430,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2560,6 +2625,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx index 0cbf598d813..e0cd1ca96cc 100644 --- a/test/blackbox/types/Data1mbPubSubTypes.cxx +++ b/test/blackbox/types/Data1mbPubSubTypes.cxx @@ -85,6 +85,11 @@ bool Data1mbPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx index 0b8d5772498..66c8ced5e14 100644 --- a/test/blackbox/types/Data64kbPubSubTypes.cxx +++ b/test/blackbox/types/Data64kbPubSubTypes.cxx @@ -85,6 +85,11 @@ bool Data64kbPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx index 8a418964086..9d07ff3e0a5 100644 --- a/test/blackbox/types/FixedSizedPubSubTypes.cxx +++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx @@ -83,6 +83,11 @@ bool FixedSizedPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx index 050724b99a7..3b3e7cfefa4 100644 --- a/test/blackbox/types/HelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx index ba528f396c1..04679de8393 100644 --- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx +++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx @@ -85,6 +85,11 @@ bool KeyedData1mbPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx index f5714a42c75..3b8d41a9f0c 100644 --- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool KeyedHelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx index a030d2a9d40..059bdcd5e60 100644 --- a/test/blackbox/types/StringTestPubSubTypes.cxx +++ b/test/blackbox/types/StringTestPubSubTypes.cxx @@ -83,6 +83,11 @@ bool StringTestPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx index b43c12a14b5..8dbca8ef7ee 100644 --- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx +++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx @@ -83,6 +83,11 @@ bool TestRegression3361PubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx index 4751dfef5d0..c5ca41f1e5d 100644 --- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx +++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool UnboundedHelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx index 5d92b732491..4f5d8a9f3ef 100644 --- a/test/blackbox/types/statistics/typesPubSubTypes.cxx +++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx @@ -87,6 +87,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -277,6 +282,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -467,6 +477,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -657,6 +672,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -847,6 +867,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1037,6 +1062,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1230,6 +1260,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1420,6 +1455,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1610,6 +1650,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1800,6 +1845,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1990,6 +2040,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2180,6 +2235,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2370,6 +2430,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2560,6 +2625,11 @@ namespace eprosima { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx index 3aa18060dc2..d3ca4e57ceb 100644 --- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx +++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx @@ -83,6 +83,11 @@ bool AllocTestTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx index c4bd34e1232..a098f3e9ffd 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx +++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx @@ -83,6 +83,11 @@ bool StructTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -279,6 +284,11 @@ bool ContentFilterTestTypePubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/dynamic_types/idl/BasicPubSubTypes.cxx b/test/unittest/dynamic_types/idl/BasicPubSubTypes.cxx index efe25ce72f8..b0eb4e27d8b 100644 --- a/test/unittest/dynamic_types/idl/BasicPubSubTypes.cxx +++ b/test/unittest/dynamic_types/idl/BasicPubSubTypes.cxx @@ -87,6 +87,11 @@ bool EnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -277,6 +282,11 @@ bool AliasStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -467,6 +477,11 @@ bool AliasAliasStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -657,6 +672,11 @@ bool BoolStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -847,6 +867,11 @@ bool OctetStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1037,6 +1062,11 @@ bool ShortStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1227,6 +1257,11 @@ bool LongStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1417,6 +1452,11 @@ bool LongLongStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1607,6 +1647,11 @@ bool UShortStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1797,6 +1842,11 @@ bool ULongStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1987,6 +2037,11 @@ bool ULongLongStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2177,6 +2232,11 @@ bool FloatStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2367,6 +2427,11 @@ bool DoubleStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2557,6 +2622,11 @@ bool LongDoubleStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2747,6 +2817,11 @@ bool CharStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2937,6 +3012,11 @@ bool WCharStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3127,6 +3207,11 @@ bool StringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3317,6 +3402,11 @@ bool WStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3507,6 +3597,11 @@ bool LargeStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3697,6 +3792,11 @@ bool LargeWStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3887,6 +3987,11 @@ bool ArraytStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4079,6 +4184,11 @@ bool ArrayArrayStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4271,6 +4381,11 @@ bool SequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4465,6 +4580,11 @@ bool SequenceSequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4657,6 +4777,11 @@ bool MapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4851,6 +4976,11 @@ bool MapMapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5042,6 +5172,11 @@ bool BitsetStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5232,6 +5367,11 @@ bool StructStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5422,6 +5562,11 @@ bool StructStructStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5624,6 +5769,11 @@ bool SimpleUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5814,6 +5964,11 @@ bool UnionUnionUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6004,6 +6159,11 @@ bool WCharUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/dynamic_types/idl/BasicPubSubTypes.h b/test/unittest/dynamic_types/idl/BasicPubSubTypes.h index 467e624b19b..672b72f0e94 100644 --- a/test/unittest/dynamic_types/idl/BasicPubSubTypes.h +++ b/test/unittest/dynamic_types/idl/BasicPubSubTypes.h @@ -95,7 +95,7 @@ class EnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -185,7 +185,7 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -275,7 +275,7 @@ class AliasAliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED diff --git a/test/unittest/dynamic_types/idl/TestPubSubTypes.cxx b/test/unittest/dynamic_types/idl/TestPubSubTypes.cxx index d450d6de064..b9d57045e3c 100644 --- a/test/unittest/dynamic_types/idl/TestPubSubTypes.cxx +++ b/test/unittest/dynamic_types/idl/TestPubSubTypes.cxx @@ -89,6 +89,11 @@ bool BasicStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -291,6 +296,11 @@ bool ComplexStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -489,6 +499,11 @@ bool CompleteStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -679,6 +694,11 @@ bool KeyedStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.cxx b/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.cxx index 61982d3150e..6d4ee170273 100644 --- a/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.cxx +++ b/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.cxx @@ -83,6 +83,11 @@ bool NewAliasesPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -286,6 +291,11 @@ namespace bitmodule { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -476,6 +486,11 @@ namespace bitmodule { ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; + #if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); + #else + ser.setDDSCdrOptions(0); + #endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -669,6 +684,11 @@ bool StructTestPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/xtypes/idl/TypesPubSubTypes.cxx b/test/unittest/xtypes/idl/TypesPubSubTypes.cxx index 0c0a8f0363e..bd2a4d33d56 100644 --- a/test/unittest/xtypes/idl/TypesPubSubTypes.cxx +++ b/test/unittest/xtypes/idl/TypesPubSubTypes.cxx @@ -83,6 +83,11 @@ bool MyEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -273,6 +278,11 @@ bool MyBadEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -465,6 +475,11 @@ bool MyAliasEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -655,6 +670,11 @@ bool BasicStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -845,6 +865,11 @@ bool BasicNamesStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1035,6 +1060,11 @@ bool BasicBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1225,6 +1255,11 @@ bool BasicWideStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1415,6 +1450,11 @@ bool BadBasicWideStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1605,6 +1645,11 @@ bool StringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1795,6 +1840,11 @@ bool LargeStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1985,6 +2035,11 @@ bool WStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2175,6 +2230,11 @@ bool LargeWStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2365,6 +2425,11 @@ bool ArrayStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2555,6 +2620,11 @@ bool ArrayStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2745,6 +2815,11 @@ bool ArrayBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2935,6 +3010,11 @@ bool ArrayDimensionsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3125,6 +3205,11 @@ bool ArraySizeStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3317,6 +3402,11 @@ bool SequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3509,6 +3599,11 @@ bool SequenceStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3701,6 +3796,11 @@ bool SequenceBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3893,6 +3993,11 @@ bool SequenceBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4087,6 +4192,11 @@ bool SequenceSequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4281,6 +4391,11 @@ bool SequenceSequenceBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4473,6 +4588,11 @@ bool MapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4665,6 +4785,11 @@ bool MapStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4857,6 +4982,11 @@ bool MapBadKeyStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5049,6 +5179,11 @@ bool MapBadElemStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5241,6 +5376,11 @@ bool MapBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5435,6 +5575,11 @@ bool MapMapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5629,6 +5774,11 @@ bool MapMapBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5839,6 +5989,11 @@ bool SimpleUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6029,6 +6184,11 @@ bool SimpleUnionStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6219,6 +6379,11 @@ bool SimpleUnionNamesStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6409,6 +6574,11 @@ bool SimpleTypeUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6599,6 +6769,11 @@ bool SimpleBadUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6789,6 +6964,11 @@ bool SimplBadDiscUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/xtypes/idl/TypesPubSubTypes.h b/test/unittest/xtypes/idl/TypesPubSubTypes.h index 6a934f82843..98a89f62ded 100644 --- a/test/unittest/xtypes/idl/TypesPubSubTypes.h +++ b/test/unittest/xtypes/idl/TypesPubSubTypes.h @@ -93,7 +93,7 @@ class MyEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -183,7 +183,7 @@ class MyBadEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -274,7 +274,7 @@ class MyAliasEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED diff --git a/test/unittest/xtypes/idl/WideEnumPubSubTypes.cxx b/test/unittest/xtypes/idl/WideEnumPubSubTypes.cxx index 3e60c0cd922..729809f9372 100644 --- a/test/unittest/xtypes/idl/WideEnumPubSubTypes.cxx +++ b/test/unittest/xtypes/idl/WideEnumPubSubTypes.cxx @@ -83,6 +83,11 @@ bool MyEnumWideStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -277,6 +282,11 @@ bool SimpleWideUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/unittest/xtypes/idl/WideEnumPubSubTypes.h b/test/unittest/xtypes/idl/WideEnumPubSubTypes.h index 8119ba12ac2..10a69ba5a58 100644 --- a/test/unittest/xtypes/idl/WideEnumPubSubTypes.h +++ b/test/unittest/xtypes/idl/WideEnumPubSubTypes.h @@ -93,7 +93,7 @@ class MyEnumWideStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED diff --git a/test/xtypes/idl/TypesPubSubTypes.cxx b/test/xtypes/idl/TypesPubSubTypes.cxx index 0c0a8f0363e..bd2a4d33d56 100644 --- a/test/xtypes/idl/TypesPubSubTypes.cxx +++ b/test/xtypes/idl/TypesPubSubTypes.cxx @@ -83,6 +83,11 @@ bool MyEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -273,6 +278,11 @@ bool MyBadEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -465,6 +475,11 @@ bool MyAliasEnumStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -655,6 +670,11 @@ bool BasicStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -845,6 +865,11 @@ bool BasicNamesStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1035,6 +1060,11 @@ bool BasicBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1225,6 +1255,11 @@ bool BasicWideStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1415,6 +1450,11 @@ bool BadBasicWideStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1605,6 +1645,11 @@ bool StringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1795,6 +1840,11 @@ bool LargeStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -1985,6 +2035,11 @@ bool WStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2175,6 +2230,11 @@ bool LargeWStringStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2365,6 +2425,11 @@ bool ArrayStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2555,6 +2620,11 @@ bool ArrayStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2745,6 +2815,11 @@ bool ArrayBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -2935,6 +3010,11 @@ bool ArrayDimensionsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3125,6 +3205,11 @@ bool ArraySizeStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3317,6 +3402,11 @@ bool SequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3509,6 +3599,11 @@ bool SequenceStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3701,6 +3796,11 @@ bool SequenceBadStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -3893,6 +3993,11 @@ bool SequenceBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4087,6 +4192,11 @@ bool SequenceSequenceStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4281,6 +4391,11 @@ bool SequenceSequenceBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4473,6 +4588,11 @@ bool MapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4665,6 +4785,11 @@ bool MapStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -4857,6 +4982,11 @@ bool MapBadKeyStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5049,6 +5179,11 @@ bool MapBadElemStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5241,6 +5376,11 @@ bool MapBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5435,6 +5575,11 @@ bool MapMapStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5629,6 +5774,11 @@ bool MapMapBoundsStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -5839,6 +5989,11 @@ bool SimpleUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6029,6 +6184,11 @@ bool SimpleUnionStructEqualPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6219,6 +6379,11 @@ bool SimpleUnionNamesStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6409,6 +6574,11 @@ bool SimpleTypeUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6599,6 +6769,11 @@ bool SimpleBadUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { @@ -6789,6 +6964,11 @@ bool SimplBadDiscUnionStructPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { diff --git a/test/xtypes/idl/TypesPubSubTypes.h b/test/xtypes/idl/TypesPubSubTypes.h index 6a934f82843..98a89f62ded 100644 --- a/test/xtypes/idl/TypesPubSubTypes.h +++ b/test/xtypes/idl/TypesPubSubTypes.h @@ -93,7 +93,7 @@ class MyEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -183,7 +183,7 @@ class MyBadEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED @@ -274,7 +274,7 @@ class MyAliasEnumStructPubSubType : public eprosima::fastdds::dds::TopicDataType #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED eProsima_user_DllExport inline bool is_bounded() const override { - return false; + return true; } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED