diff options
45 files changed, 81 insertions, 83 deletions
diff --git a/.travis.yml b/.travis.yml index eae990d0ca5..430fde91889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_script: - if [ "$ACEFORTAO" == "1" ]; then echo -e "ace_for_tao=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi - - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU + - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst - if [ "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 20e54dab5c9..0e35b2ceb8a 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -1529,7 +1529,7 @@ ACE::t_snd_n_i (ACE_HANDLE handle, { // Check for possible blocking. if (n == -1 && - errno == EWOULDBLOCK || errno == ENOBUFS) + (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto <timeout> for the blocking to subside. int const rtn = ACE::handle_write_ready (handle, timeout); diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index 3bc7bd09d13..7453273a511 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -169,11 +169,11 @@ Client::handle_input (ACE_HANDLE handle) ACE_TEXT ("(%t) Client::handle_input handle = %d bytes_read = %d\n"), handle, bytes_read)); - if (bytes_read < 0 && errno == EWOULDBLOCK) + if (bytes_read == -1 && errno == EWOULDBLOCK) { return 0; } - else if (bytes_read == 0) + else if (bytes_read <= 0) { // Closed. return -1; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml index dfd4b8a30ef..0facf24ed88 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="HelloProfile" is_default_qos="true"> + <qos_profile name="HelloProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> @@ -61,4 +61,4 @@ RTI Data Distribution Service user manual. </qos_profile> </qos_library> -</dds>
\ No newline at end of file +</dds> diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml index d47b16c293b..3d764fe83c7 100644 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ShapesProfile" is_default_qos="true"> + <qos_profile name="ShapesProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml index 9d7103a914e..869924df719 100644 --- a/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/examples/ShapesContr/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="square" is_default_qos="true"> + <qos_profile name="square" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml index 56908409148..9f9ee918fd3 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml @@ -31,7 +31,7 @@ A QoS profile groups a set of related QoS. --> - <qos_profile name="UDPv4QoS" is_default_qos="true"> + <qos_profile name="UDPv4QoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> @@ -126,7 +126,7 @@ </datareader_qos> </qos_profile> - <qos_profile name="SharedMemQos" is_default_qos="true"> + <qos_profile name="SharedMemQos" is_default_qos="false"> <participant_qos> <transport_builtin> <mask>DDS_TRANSPORTBUILTIN_SHMEM</mask> diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml index b24290e6c96..970433834aa 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ThroughputPartQoS" is_default_qos="true"> + <qos_profile name="ThroughputPartQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> @@ -51,7 +51,7 @@ RTI Data Distribution Service user manual. </participant_qos> </qos_profile> - <qos_profile name="ThroughputQoS" is_default_qos="true"> + <qos_profile name="ThroughputQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> @@ -105,7 +105,7 @@ RTI Data Distribution Service user manual. </datareader_qos> </qos_profile> - <qos_profile name="ThroughputCmdQoS" is_default_qos="true"> + <qos_profile name="ThroughputCmdQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml index 2b76b6f08e1..aa0e70c5999 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="LatencyQoS" is_default_qos="true"> + <qos_profile name="LatencyQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml index 56908409148..9f9ee918fd3 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml @@ -31,7 +31,7 @@ A QoS profile groups a set of related QoS. --> - <qos_profile name="UDPv4QoS" is_default_qos="true"> + <qos_profile name="UDPv4QoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> @@ -126,7 +126,7 @@ </datareader_qos> </qos_profile> - <qos_profile name="SharedMemQos" is_default_qos="true"> + <qos_profile name="SharedMemQos" is_default_qos="false"> <participant_qos> <transport_builtin> <mask>DDS_TRANSPORTBUILTIN_SHMEM</mask> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml index 0e1ffccf022..3016673f87c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ThroughputQoS" is_default_qos="true"> + <qos_profile name="ThroughputQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> @@ -82,7 +82,7 @@ RTI Data Distribution Service user manual. </datareader_qos> </qos_profile> - <qos_profile name="ThroughputCmdQoS" is_default_qos="true"> + <qos_profile name="ThroughputCmdQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <participant_qos> <receiver_pool> diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml index 1c125f14f6d..e6facde6f0b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="HelloProfile" is_default_qos="true"> + <qos_profile name="HelloProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml index 0fdacd078d6..2109e905309 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="SenderProfile" is_default_qos="true"> + <qos_profile name="SenderProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> @@ -56,7 +56,7 @@ RTI Data Distribution Service user manual. </datawriter_qos> </qos_profile> - <qos_profile name="ReceiverProfile" is_default_qos="true"> + <qos_profile name="ReceiverProfile" is_default_qos="false"> <datareader_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml index e69ce5ae926..76c111f3515 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml @@ -30,7 +30,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="HelloProfile" is_default_qos="true"> + <qos_profile name="HelloProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml index c07018d1d6e..f2bf87beddf 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="CSLProfile" is_default_qos="true"> + <qos_profile name="CSLProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml index ad81f2e6850..d46728dbf53 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="CoherentUpdaterProfile" is_default_qos="true"> + <qos_profile name="CoherentUpdaterProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml index 8054b3eeee1..92bb5c31801 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="CoherentWriterProfile" is_default_qos="true"> + <qos_profile name="CoherentWriterProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml index ea26f3b83c2..75007b4404d 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml index b2db6d4f1f9..a2ea7207800 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="GetterProfile" is_default_qos="true"> + <qos_profile name="GetterProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml index dfd4b8a30ef..6efbf0f6fb3 100644 --- a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="HelloProfile" is_default_qos="true"> + <qos_profile name="HelloProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml index 25ca3d326ec..01b07188022 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="KeyedWriterProfile" is_default_qos="true"> + <qos_profile name="KeyedWriterProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml index 5ac842d55d7..84fcb573f76 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -4,7 +4,7 @@ <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="LateBinding_Library"> - <qos_profile name="LateBindingProfile" is_default_qos="true"> + <qos_profile name="LateBindingProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml index c0cfedb62d1..ad8bc8ed52f 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ListenManyByManyProfile" is_default_qos="true"> + <qos_profile name="ListenManyByManyProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml index 055636f35cc..1e1d74d6186 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="DeadlineProfile" is_default_qos="true"> + <qos_profile name="DeadlineProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml index 5001d3340a9..1c599ab21db 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="HelloProfile" is_default_qos="true"> + <qos_profile name="HelloProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml index 19948c6d085..1f6edf73025 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ProxyRWProfile" is_default_qos="true"> + <qos_profile name="ProxyRWProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml index 3fd3bfeff99..7652e49300c 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml @@ -4,7 +4,7 @@ <dds xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="QosProfile_Library"> - <qos_profile name="QosProfileProfile" is_default_qos="true"> + <qos_profile name="QosProfileProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml index dd5f83468ab..24d6b2eb8f3 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml @@ -30,7 +30,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml index dd5f83468ab..24d6b2eb8f3 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml @@ -30,7 +30,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml index ea26f3b83c2..75007b4404d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml index ea26f3b83c2..75007b4404d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml index ea26f3b83c2..75007b4404d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml index bad6029914a..dc3a57f133d 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="QueryConditionProfile" is_default_qos="true"> + <qos_profile name="QueryConditionProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml index 7afea6a6fc1..a3245c44987 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="ReaderProfile" is_default_qos="true"> + <qos_profile name="ReaderProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml index 75b8d3b79de..e3268d2c621 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml @@ -2,7 +2,7 @@ <!-- --> <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="ResetTopic_Library"> - <qos_profile name="ResetTopicProfile" is_default_qos="true"> + <qos_profile name="ResetTopicProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml index 20f8adc70d1..55f7c22419e 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="SlMbMProfile" is_default_qos="true"> + <qos_profile name="SlMbMProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml index 983fd474490..e1a8f96ecfd 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="SlObOProfile" is_default_qos="true"> + <qos_profile name="SlObOProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml index e125eab41aa..f1018e84958 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml @@ -4,7 +4,7 @@ <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="Shared_Library"> - <qos_profile name="SharedProfile" is_default_qos="true"> + <qos_profile name="SharedProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> @@ -41,7 +41,7 @@ </qos_profile> </qos_library> <qos_library name="Standalone_Library"> - <qos_profile name="StandaloneProfile" is_default_qos="true"> + <qos_profile name="StandaloneProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml index e125eab41aa..f1018e84958 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/descriptors/USER_QOS_PROFILES.xml @@ -4,7 +4,7 @@ <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="Shared_Library"> - <qos_profile name="SharedProfile" is_default_qos="true"> + <qos_profile name="SharedProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> @@ -41,7 +41,7 @@ </qos_profile> </qos_library> <qos_library name="Standalone_Library"> - <qos_profile name="StandaloneProfile" is_default_qos="true"> + <qos_profile name="StandaloneProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml index e125eab41aa..f1018e84958 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml @@ -4,7 +4,7 @@ <dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> <qos_library name="Shared_Library"> - <qos_profile name="SharedProfile" is_default_qos="true"> + <qos_profile name="SharedProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> @@ -41,7 +41,7 @@ </qos_profile> </qos_library> <qos_library name="Standalone_Library"> - <qos_profile name="StandaloneProfile" is_default_qos="true"> + <qos_profile name="StandaloneProfile" is_default_qos="false"> <datawriter_qos> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml index e9caef47b6f..738d0cbe072 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml @@ -28,7 +28,7 @@ RTI Data Distribution Service user manual. A QoS profile groups a set of related QoS. --> - <qos_profile name="UnkeyedWriterProfile" is_default_qos="true"> + <qos_profile name="UnkeyedWriterProfile" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> diff --git a/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml b/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml index 9bfff9471cf..22749c51237 100644 --- a/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml +++ b/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml @@ -2,7 +2,7 @@ <!-- Default QoS specification for NDDS logger. --> <dds> <qos_library name="DAnCE"> - <qos_profile name="Logger" is_default_qos="true"> + <qos_profile name="Logger" is_default_qos="false"> <topic_qos name="DAnCELogging"> <reliability> <kind>RELIABLE_RELIABILITY_QOS</kind> diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp index 1b530343a03..c8bc7e309a6 100755 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp @@ -64,34 +64,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableServer::POAManager_var mgr = root_poa->the_POAManager (); PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name ); - Test_i *impl = new Test_i (); - PortableServer::Servant_var<Test_i> test_servant = impl; - - PortableServer::ObjectId_var object_id = - PortableServer::string_to_ObjectId ("test_object"); - - test_poa->activate_object_with_id (object_id.in(), test_servant.in()); - - obj = test_poa->id_to_reference (object_id.in ()); - CORBA::String_var test_ior = orb->object_to_string (obj.in ()); - FILE *f = ACE_OS::fopen (ior_file_name, ACE_TEXT ("w")); - ACE_OS::fprintf (f, "%s", test_ior.in ()); - ACE_OS::fclose (f); - - mgr->activate(); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Started Server <%s>\n"), - poa_name)); - - ACE_Time_Value tv (1,0); - orb->run (tv); - root_poa->destroy(1,1); - orb->destroy(); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Server <%s> orb destroyed\n"), - poa_name)); - } + Test_i *impl = new Test_i (); + PortableServer::Servant_var<Test_i> test_servant = impl; + + PortableServer::ObjectId_var object_id = + PortableServer::string_to_ObjectId ("test_object"); + + test_poa->activate_object_with_id (object_id.in(), test_servant.in()); + + obj = test_poa->id_to_reference (object_id.in ()); + CORBA::String_var test_ior = orb->object_to_string (obj.in ()); + FILE *f = ACE_OS::fopen (ior_file_name, ACE_TEXT ("w")); + ACE_OS::fprintf (f, "%s", test_ior.in ()); + ACE_OS::fclose (f); + + mgr->activate(); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Started Server <%s>\n"), + poa_name)); + + ACE_Time_Value tv (1,0); + orb->run (tv); + root_poa->destroy(1,1); + orb->destroy(); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Server <%s> orb destroyed\n"), + poa_name)); + } catch(const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Server main()")); return 1; diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index f61b145bf7a..982ab13ebb7 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -12,7 +12,6 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 417e3d72eb3..3e73ac25c1c 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -837,7 +837,6 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) // Transfer ownership to the CORBA::Object (void) safe_objdata.release (); - return; } CORBA::Boolean |