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.

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

Fix compilation against latest YARP master branch #607

Merged
merged 7 commits into from
Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo

## [Unreleased]

## [4.1.2] - 2022-01-19

### Fixed
- Fix compilation against YARP 3.7 (https://github.com/robotology/gazebo-yarp-plugins/pull/607, https://github.com/robotology/gazebo-yarp-plugins/issues/608).

## [4.1.1] - 2022-01-13

### Fixed
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,4 @@ endif()

# add a dox target to generate doxygen documentation
add_subdirectory(doc)

2 changes: 1 addition & 1 deletion plugins/clock/include/GazeboYarpPlugins/ClockServerImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* CopyPolicy: Released under the terms of the LGPLv2.1 or any later version, see LGPL.TXT or LGPL3.TXT
*/

#include <ClockServer.h>
#include <GazeboYarpPlugins/ClockServer.h>

namespace GazeboYarpPlugins {
class ClockServerImpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <GazeboYarpPlugins/common.h>
#include <GazeboYarpPlugins/ConfHelpers.hh>

#include <LinkAttacherServer.h>
#include <GazeboYarpPlugins/LinkAttacherServer.h>

const std::string LogPrefix = "LinkAttacher:";
// available joint types in SDF (http://sdformat.org/spec?ver=1.6&elem=joint#joint_type)
Expand Down
2 changes: 1 addition & 1 deletion plugins/worldinterface/src/worldinterfaceserverimpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef YARPGAZEBO_WORLD_INTERFACESERVERIMPL
#define YARPGAZEBO_WORLD_INTERFACESERVERIMPL

#include <WorldInterfaceServer.h>
#include <GazeboYarpPlugins/WorldInterfaceServer.h>
#include "worldproxy.h"

class WorldInterfaceServerImpl: public GazeboYarpPlugins::WorldInterfaceServer
Expand Down
2 changes: 1 addition & 1 deletion plugins/worldinterface/src/worldproxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <yarp/os/Semaphore.h>

#include "WorldInterfaceServer.h"
#include <GazeboYarpPlugins/WorldInterfaceServer.h>

#include <map>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion thrift/clock/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set(LIBRARY_TARGET_NAME gazebo_yarp_rpc_clock)

yarp_idl_to_dir(INPUT_FILES clock_rpc.thrift
OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/autogenerated
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/autogenerated
SOURCES_VAR CLOCKRPC_SRC
HEADERS_VAR CLOCKRPC_HEADERS
INCLUDE_DIRS_VAR CLOCKRPC_INCLUDES)
Expand Down
2 changes: 0 additions & 2 deletions thrift/clock/autogenerated/clock_rpc_index.txt

This file was deleted.

11 changes: 0 additions & 11 deletions thrift/clock/autogenerated/clock_rpc_thrift.cmake

This file was deleted.

92 changes: 0 additions & 92 deletions thrift/clock/autogenerated/include/ClockServer.h

This file was deleted.

89 changes: 0 additions & 89 deletions thrift/clock/autogenerated/include/GazeboYarpPlugins/ClockServer.h

This file was deleted.

Loading