Skip to content

Commit

Permalink
Refs #20566: Uncrustify
Browse files Browse the repository at this point in the history 
Signed-off-by: elianalf <[email protected]>
Signed-off-by: EduPonz <[email protected]>
  • Loading branch information
@elianalf @EduPonz
elianalf authored and EduPonz committed Mar 12, 2024
1 parent 4dff6ca commit f7ba751
Show file tree
Hide file tree
Showing 55 changed files with 4,632 additions and 4,648 deletions.
2 changes: 1 addition & 1 deletion examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class AdvancedConfigurationPubSubType : public eprosima::fastdds::dds::TopicData
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Configurability/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class TopicPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class CustomPayloadPoolDataPubSubType : public eprosima::fastdds::dds::TopicData
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloMsgPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class TopicPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class FilteringExamplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class FlowControlExamplePubSubType : public eprosima::fastdds::dds::TopicDataTyp
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HistoryKind/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Keys/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LateJoiners/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class LifespanPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class TopicPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ExampleMessagePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down Expand Up @@ -195,7 +195,7 @@ class ReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
static_cast<void>(data_representation);
return false;
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
{
return is_plain_xcdrv2_impl();
}
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
}

eProsima_user_DllExport inline bool is_plain(
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
{
if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
{
return is_plain_xcdrv2_impl();
}
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
#include <fastdds/rtps/attributes/ReaderAttributes.h>
#include <fastdds/rtps/attributes/TopicAttributes.h>
#include <fastdds/fastrtps_dll.h>
#include <fastdds/fastdds_dll.hpp>

namespace eprosima {
namespace fastdds {
Expand Down
5 changes: 0 additions & 5 deletions include/fastdds/utils/md5.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ class FASTDDS_EXPORTED_API MD5
void init();

private:
<<<<<<< HEAD:include/fastrtps/utils/md5.h
=======

>>>>>>> b4d1e6d55 (Refs #20566: Migrate fastrtps/utils/md5.h to fastdds/utils):include/fastdds/utils/md5.h

typedef unsigned int uint4; // 32bit
enum
Expand All @@ -103,7 +99,6 @@ class FASTDDS_EXPORTED_API MD5
uint4 count[2]; // 64bit counter for number of bits (lo, hi)
uint4 state[4]; // digest so far


// low level logic operations
static inline uint4 F(
uint4 x,
Expand Down
Loading

0 comments on commit f7ba751

Please sign in to comment.