Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Correct clang warnings due to overwritten methods [7236] #954

Merged
merged 1 commit into from
Jan 14, 2020
Merged

[master] Correct clang warnings due to overwritten methods [7236] #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ if(BUILD_DOCUMENTATION)
elseif(WIN32)
set(DOXYFILE_MAKE make.bat)
endif()

if(NOT CHECK_DOCUMENTATION)
find_program(WGET_EXE wget)
if(WGET_EXE)
Expand Down
20 changes: 10 additions & 10 deletions test/performance/latency/LatencyTestTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ class LatencyDataType : public eprosima::fastrtps::TopicDataType
m_isGetKeyDefined = false;
};
~LatencyDataType(){};
bool serialize(void*data, eprosima::fastrtps::rtps::SerializedPayload_t* payload);
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data);
std::function<uint32_t()> getSerializedSizeProvider(void* data);
void* createData();
void deleteData(void* data);
bool serialize(void*data, eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data) override;
std::function<uint32_t()> getSerializedSizeProvider(void* data) override;
void* createData() override;
void deleteData(void* data) override;
bool getKey(void* /*data*/, eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override {
(void)force_md5;
return false;
Expand Down Expand Up @@ -99,11 +99,11 @@ class TestCommandDataType : public eprosima::fastrtps::TopicDataType
m_isGetKeyDefined = false;
};
~TestCommandDataType(){};
bool serialize(void*data,eprosima::fastrtps::rtps::SerializedPayload_t* payload);
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data);
std::function<uint32_t()> getSerializedSizeProvider(void* data);
void* createData();
void deleteData(void* data);
bool serialize(void*data,eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data) override;
std::function<uint32_t()> getSerializedSizeProvider(void* data) override;
void* createData() override;
void deleteData(void* data) override;
bool getKey(void* /*data*/, eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override {
(void)force_md5;
return false;
Expand Down
6 changes: 0 additions & 6 deletions test/performance/latency/main_LatencyTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
using namespace eprosima::fastrtps;
using namespace eprosima::fastrtps::rtps;

#if defined(__LITTLE_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = LITTLEEND;
#elif defined (__BIG_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = BIGEND;
#endif

#if defined(_WIN32)
#define COPYSTR strcpy_s
#else
Expand Down
20 changes: 10 additions & 10 deletions test/performance/throughput/ThroughputTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,19 @@ class ThroughputDataType: public eprosima::fastrtps::TopicDataType

bool serialize(
void*data,
eprosima::fastrtps::rtps::SerializedPayload_t* payload);
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;

bool deserialize(
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
void * data);
void * data) override;

std::function<uint32_t()> getSerializedSizeProvider(
void* data);
void* data) override;

void* createData();
void* createData() override;

void deleteData(
void* data);
void* data) override;

bool getKey(
void* /*data*/,
Expand Down Expand Up @@ -230,19 +230,19 @@ class ThroughputCommandDataType : public eprosima::fastrtps::TopicDataType

bool serialize(
void*data,
eprosima::fastrtps::rtps::SerializedPayload_t* payload);
eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;

bool deserialize(
eprosima::fastrtps::rtps::SerializedPayload_t* payload,
void * data);
void * data) override;

std::function<uint32_t()> getSerializedSizeProvider(
void* data);
void* data) override;

void* createData();
void* createData() override;

void deleteData(
void* data);
void* data) override;

bool getKey(
void* /*data*/,
Expand Down
7 changes: 0 additions & 7 deletions test/performance/throughput/main_ThroughputTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@
using namespace eprosima::fastrtps;
using namespace eprosima::fastrtps::rtps;


#if defined(__LITTLE_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = LITTLEEND;
#elif defined (__BIG_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = BIGEND;
#endif

#if defined(_WIN32)
#define COPYSTR strcpy_s
#else
Expand Down
20 changes: 10 additions & 10 deletions test/performance/video/VideoTestTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ class VideoDataType : public eprosima::fastrtps::TopicDataType
m_isGetKeyDefined = false;
};
~VideoDataType(){};
bool serialize(void*data, eprosima::fastrtps::rtps::SerializedPayload_t* payload);
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data);
std::function<uint32_t()> getSerializedSizeProvider(void* data);
void* createData();
void deleteData(void* data);
bool serialize(void*data, eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data) override;
std::function<uint32_t()> getSerializedSizeProvider(void* data) override;
void* createData() override;
void deleteData(void* data) override;
bool getKey(void* /*data*/, eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override {
(void)force_md5;
return false;
Expand Down Expand Up @@ -110,11 +110,11 @@ class TestCommandDataType : public eprosima::fastrtps::TopicDataType
m_isGetKeyDefined = false;
};
~TestCommandDataType(){};
bool serialize(void*data,eprosima::fastrtps::rtps::SerializedPayload_t* payload);
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data);
std::function<uint32_t()> getSerializedSizeProvider(void* data);
void* createData();
void deleteData(void* data);
bool serialize(void*data,eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
bool deserialize(eprosima::fastrtps::rtps::SerializedPayload_t* payload,void * data) override;
std::function<uint32_t()> getSerializedSizeProvider(void* data) override;
void* createData() override;
void deleteData(void* data) override;
bool getKey(void* /*data*/, eprosima::fastrtps::rtps::InstanceHandle_t* /*ihandle*/, bool force_md5 = false) override {
(void)force_md5;
return false;
Expand Down
6 changes: 0 additions & 6 deletions test/performance/video/main_VideoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
using namespace eprosima::fastrtps;
using namespace eprosima::fastrtps::rtps;

#if defined(__LITTLE_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = LITTLEEND;
#elif defined (__BIG_ENDIAN__)
const Endianness_t DEFAULT_ENDIAN = BIGEND;
#endif

#if defined(_WIN32)
#define COPYSTR strcpy_s
#else
Expand Down