Skip to content

Commit

Permalink
Merge pull request #767 from ros/fix_warnings
Browse files Browse the repository at this point in the history
fix CMake and compiler warnings
  • Loading branch information
dirk-thomas committed Mar 14, 2016
2 parents eb8f52a + 69b4610 commit 98aa98e
Show file tree
Hide file tree
Showing 38 changed files with 160 additions and 154 deletions.
2 changes: 1 addition & 1 deletion clients/roscpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ add_library(roscpp
src/libros/this_node.cpp
)

add_dependencies(roscpp roscpp_gencpp rosgraph_msgs_gencpp std_msgs_gencpp)
add_dependencies(roscpp ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

target_link_libraries(roscpp
${catkin_LIBRARIES}
Expand Down
2 changes: 1 addition & 1 deletion test/test_roscpp/perf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

#common commands for building c++ executables and libraries
add_library(${PROJECT_NAME}_perf EXCLUDE_FROM_ALL src/intra.cpp src/inter.cpp)
add_dependencies(${PROJECT_NAME}_perf ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}_perf ${${PROJECT_NAME}_EXPORTED_TARGETS})
target_link_libraries(${PROJECT_NAME}_perf ${Boost_LIBRARIES} ${catkin_LIBRARIES})

# These performance tests will not be built or executed automatically.
Expand Down
2 changes: 1 addition & 1 deletion test/test_roscpp/perf_serialization/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ target_link_libraries(${PROJECT_NAME}-pointcloud_serdes ${catkin_LIBRARIES})
if(TARGET tests)
add_dependencies(tests ${PROJECT_NAME}-pointcloud_serdes)
endif()
add_dependencies(${PROJECT_NAME}-pointcloud_serdes ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-pointcloud_serdes ${${PROJECT_NAME}_EXPORTED_TARGETS})
#rosbuild_add_compile_flags(pointcloud_serdes "-O3 -funroll-loops")
#rosbuild_add_compile_flags(pointcloud_serdes "-march=prescott")
142 changes: 71 additions & 71 deletions test/test_roscpp/test/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ target_link_libraries(${PROJECT_NAME}-param_update_test ${catkin_LIBRARIES})

add_executable(${PROJECT_NAME}-real_time_test EXCLUDE_FROM_ALL real_time_test.cpp)
target_link_libraries(${PROJECT_NAME}-real_time_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-real_time_test rosgraph_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-real_time_test ${rosgraph_msgs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-sim_time_test EXCLUDE_FROM_ALL sim_time_test.cpp)
target_link_libraries(${PROJECT_NAME}-sim_time_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-sim_time_test rosgraph_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-sim_time_test ${rosgraph_msgs_EXPORTED_TARGETS})

# Call a service
add_executable(${PROJECT_NAME}-service_adv EXCLUDE_FROM_ALL service_adv.cpp)
Expand All @@ -76,14 +76,14 @@ target_link_libraries(${PROJECT_NAME}-service_call_zombie ${GTEST_LIBRARIES} ${c

add_executable(${PROJECT_NAME}-service_deadlock EXCLUDE_FROM_ALL service_deadlock.cpp)
target_link_libraries(${PROJECT_NAME}-service_deadlock ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-service_deadlock std_srvs_gencpp)
add_dependencies(${PROJECT_NAME}-service_deadlock ${std_srvs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-service_call_repeatedly EXCLUDE_FROM_ALL service_call_repeatedly.cpp)
target_link_libraries(${PROJECT_NAME}-service_call_repeatedly ${catkin_LIBRARIES})

add_executable(${PROJECT_NAME}-service_exception EXCLUDE_FROM_ALL service_exception.cpp)
target_link_libraries(${PROJECT_NAME}-service_exception ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-service_exception std_srvs_gencpp)
add_dependencies(${PROJECT_NAME}-service_exception ${std_srvs_EXPORTED_TARGETS})

# Repeatedly call ros::init()
add_executable(${PROJECT_NAME}-multiple_init_fini EXCLUDE_FROM_ALL multiple_init_fini.cpp)
Expand Down Expand Up @@ -147,7 +147,7 @@ target_link_libraries(${PROJECT_NAME}-incrementing_sequence ${GTEST_LIBRARIES} $

add_executable(${PROJECT_NAME}-subscription_callback_types EXCLUDE_FROM_ALL subscription_callback_types.cpp)
target_link_libraries(${PROJECT_NAME}-subscription_callback_types ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-subscription_callback_types std_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-subscription_callback_types ${std_msgs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-service_callback_types EXCLUDE_FROM_ALL service_callback_types.cpp)
target_link_libraries(${PROJECT_NAME}-service_callback_types ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
Expand All @@ -163,11 +163,11 @@ target_link_libraries(${PROJECT_NAME}-subscribe_retry_tcp ${GTEST_LIBRARIES} ${c

add_executable(${PROJECT_NAME}-subscribe_star EXCLUDE_FROM_ALL subscribe_star.cpp)
target_link_libraries(${PROJECT_NAME}-subscribe_star ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-subscribe_star std_srvs_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_star ${std_srvs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-publisher_for_star_subscriber EXCLUDE_FROM_ALL publisher_for_star_subscriber.cpp)
target_link_libraries(${PROJECT_NAME}-publisher_for_star_subscriber ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-publisher_for_star_subscriber std_srvs_gencpp)
add_dependencies(${PROJECT_NAME}-publisher_for_star_subscriber ${std_srvs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-parameter_validation EXCLUDE_FROM_ALL parameter_validation.cpp)
target_link_libraries(${PROJECT_NAME}-parameter_validation ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
Expand All @@ -192,11 +192,11 @@ target_link_libraries(${PROJECT_NAME}-test_search_param ${GTEST_LIBRARIES} ${cat

add_executable(${PROJECT_NAME}-left_right EXCLUDE_FROM_ALL left_right.cpp)
target_link_libraries(${PROJECT_NAME}-left_right ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-left_right std_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-left_right ${std_msgs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-string_msg_expect EXCLUDE_FROM_ALL string_msg_expect.cpp)
target_link_libraries(${PROJECT_NAME}-string_msg_expect ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-string_msg_expect std_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-string_msg_expect ${std_msgs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp EXCLUDE_FROM_ALL stamped_topic_statistics_empty_timestamp.cpp)
target_link_libraries(${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
Expand All @@ -206,11 +206,11 @@ target_link_libraries(${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp $
# Call scripts/test_udp_with_dropped_packets.sh to run the test.
add_executable(${PROJECT_NAME}-publisher EXCLUDE_FROM_ALL publisher.cpp)
target_link_libraries(${PROJECT_NAME}-publisher ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-publisher std_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-publisher ${std_msgs_EXPORTED_TARGETS})

add_executable(${PROJECT_NAME}-subscriber EXCLUDE_FROM_ALL subscriber.cpp)
target_link_libraries(${PROJECT_NAME}-subscriber ${catkin_LIBRARIES})
add_dependencies(${PROJECT_NAME}-subscriber std_msgs_gencpp)
add_dependencies(${PROJECT_NAME}-subscriber ${std_msgs_EXPORTED_TARGETS})

if(TARGET tests)
add_dependencies(tests
Expand Down Expand Up @@ -279,64 +279,64 @@ if(TARGET tests)
)
endif()

add_dependencies(${PROJECT_NAME}-handles ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-timer_callbacks ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-latching_publisher ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publish_n_fast ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_self ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-pub_sub ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-sub_pub ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publish_empty ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publish_onsub ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_n_fast ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_empty ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_resubscribe ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_unsubscribe ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publish_unadvertise ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_unsubscribe_repeatedly ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publish_constantly ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-param_update_test ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-real_time_test ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-sim_time_test ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_adv ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_adv_unadv ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_call ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_call_zombie ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_deadlock ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_exception ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_call_repeatedly ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-multiple_init_fini ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-inspection ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_adv_multiple ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_adv_a ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_wait_a_adv_b ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_call_expect_b ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_adv_zombie ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-name_remapping ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-name_remapping_with_ns ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-namespaces ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-params ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-get_master_information ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-multiple_subscriptions ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-check_master ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-wait_for_message ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-loads_of_publishers ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-incrementing_sequence ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscription_callback_types ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-service_callback_types ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-intraprocess_subscriptions ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-nonconst_subscriptions ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_retry_tcp ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-subscribe_star ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-publisher_for_star_subscriber ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-parameter_validation ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-param_locale_avoidance_test ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-crashes_under_gprof ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-test_remapping ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-name_not_remappable ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-test_ns_node_remapping ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-test_search_param ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-left_right ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-string_msg_expect ${PROJECT_NAME}_gencpp)
add_dependencies(${PROJECT_NAME}-handles ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-timer_callbacks ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-latching_publisher ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publish_n_fast ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_self ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-pub_sub ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-sub_pub ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publish_empty ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publish_onsub ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_n_fast ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_empty ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_resubscribe ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_unsubscribe ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publish_unadvertise ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_unsubscribe_repeatedly ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publish_constantly ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-param_update_test ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-real_time_test ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-sim_time_test ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_adv ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_adv_unadv ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_call ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_call_zombie ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_deadlock ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_exception ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_call_repeatedly ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-multiple_init_fini ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-inspection ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_adv_multiple ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_adv_a ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_wait_a_adv_b ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_call_expect_b ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_adv_zombie ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-name_remapping ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-name_remapping_with_ns ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-namespaces ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-params ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-get_master_information ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-multiple_subscriptions ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-check_master ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-wait_for_message ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-loads_of_publishers ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-incrementing_sequence ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscription_callback_types ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-service_callback_types ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-intraprocess_subscriptions ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-nonconst_subscriptions ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_retry_tcp ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-subscribe_star ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-publisher_for_star_subscriber ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-parameter_validation ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-param_locale_avoidance_test ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-crashes_under_gprof ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-test_remapping ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-name_not_remappable ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-test_ns_node_remapping ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-test_search_param ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-left_right ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-string_msg_expect ${${PROJECT_NAME}_EXPORTED_TARGETS})
add_dependencies(${PROJECT_NAME}-stamped_topic_statistics_empty_timestamp
${PROJECT_NAME}_gencpp)
${${PROJECT_NAME}_EXPORTED_TARGETS})
10 changes: 5 additions & 5 deletions test/test_roscpp/test/src/handles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ TEST(RoscppHandles, nodeHandleParentWithRemappings)
}

int32_t g_recv_count = 0;
void subscriberCallback(const test_roscpp::TestArray::ConstPtr& msg)
void subscriberCallback(const test_roscpp::TestArray::ConstPtr&)
{
++g_recv_count;
}
Expand All @@ -134,7 +134,7 @@ class SubscribeHelper
: recv_count_(0)
{}

void callback(const test_roscpp::TestArray::ConstPtr& msg)
void callback(const test_roscpp::TestArray::ConstPtr&)
{
++recv_count_;
}
Expand Down Expand Up @@ -350,7 +350,7 @@ TEST(RoscppHandles, publisherMultiple)
ASSERT_TRUE(std::find(topics.begin(), topics.end(), "/test") == topics.end());
}

bool serviceCallback(TestStringString::Request& req, TestStringString::Response& res)
bool serviceCallback(TestStringString::Request&, TestStringString::Response&)
{
return true;
}
Expand Down Expand Up @@ -433,7 +433,7 @@ TEST(RoscppHandles, serviceAdvMultiple)
}

int32_t g_sub_count = 0;
void connectedCallback(const ros::SingleSubscriberPublisher& pub)
void connectedCallback(const ros::SingleSubscriberPublisher&)
{
++g_sub_count;
}
Expand Down Expand Up @@ -519,7 +519,7 @@ TEST(RoscppHandles, multiplePublishersWithSubscriberConnectCallback)
class ServiceClass
{
public:
bool serviceCallback(TestStringString::Request& req, TestStringString::Response& res)
bool serviceCallback(TestStringString::Request&, TestStringString::Response&)
{
return true;
}
Expand Down
12 changes: 6 additions & 6 deletions test/test_roscpp/test/src/intraprocess_subscriptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,18 @@ template<>
struct Serializer<Msg>
{
template<typename Stream>
inline static void write(Stream& stream, const Msg& v)
inline static void write(Stream&, const Msg& v)
{
v.serialized = true;
}

template<typename Stream>
inline static void read(Stream& stream, Msg& v)
inline static void read(Stream&, Msg& v)
{
v.deserialized = true;
}

inline static uint32_t serializedLength(const Msg& v)
inline static uint32_t serializedLength(const Msg&)
{
return 0;
}
Expand Down Expand Up @@ -157,18 +157,18 @@ template<>
struct Serializer<Msg2>
{
template<typename Stream>
inline static void write(Stream& stream, const Msg2& v)
inline static void write(Stream&, const Msg2& v)
{
v.serialized = true;
}

template<typename Stream>
inline static void read(Stream& stream, Msg2& v)
inline static void read(Stream&, Msg2& v)
{
v.deserialized = true;
}

inline static uint32_t serializedLength(const Msg2& v)
inline static uint32_t serializedLength(const Msg2&)
{
return 0;
}
Expand Down
3 changes: 1 addition & 2 deletions test/test_roscpp/test/src/loads_of_publishers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@

uint32_t g_pub_count = 0;

void callback(const test_roscpp::TestArrayConstPtr& msg)
void callback(const test_roscpp::TestArrayConstPtr&)
{

}

TEST(LoadsOfPublishers, waitForAll)
Expand Down
2 changes: 1 addition & 1 deletion test/test_roscpp/test/src/multiple_init_fini.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
int g_argc;
char** g_argv;

void callback(const test_roscpp::TestArrayConstPtr& msg)
void callback(const test_roscpp::TestArrayConstPtr&)
{
}

Expand Down
2 changes: 1 addition & 1 deletion test/test_roscpp/test/src/service_adv_a.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <sys/wait.h>
#include <cstdlib>

bool srvCallback(test_roscpp::TestStringString::Request &req,
bool srvCallback(test_roscpp::TestStringString::Request &,
test_roscpp::TestStringString::Response &res)
{
res.str = "A";
Expand Down
4 changes: 2 additions & 2 deletions test/test_roscpp/test/src/service_adv_multiple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
#include "ros/service.h"
#include <test_roscpp/TestStringString.h>

bool srvCallback(test_roscpp::TestStringString::Request &req,
test_roscpp::TestStringString::Response &res)
bool srvCallback(test_roscpp::TestStringString::Request &,
test_roscpp::TestStringString::Response &)
{
return true;
}
Expand Down
Loading

0 comments on commit 98aa98e

Please sign in to comment.