Skip to content

[openrtm1.1] Fix build for OpenRTM 1.1 with C++>=14 #12

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

Open
arntanguy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[openrtm1.1] Fix build for OpenRTM 1.1 with C++>=14 #12

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
6 changes: 5 additions & 1 deletion src/OpenRTMPlugin/BodyStateSubscriberRTCItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
#ifdef USE_BUILTIN_CAMERA_IMAGE_IDL
# include "deprecated/corba/CameraImage.hh"
#else
# include <rtm/idl/CameraCommonInterface.hh>
#if defined(OPENRTM_VERSION11)
# include <rtm/ext/CameraCommonInterface.hh>
#else
# include <rtm/idl/CameraCommonInterface.hh>
#endif
#endif

#include <rtm/DataInPort.h>
Expand Down
6 changes: 5 additions & 1 deletion src/OpenRTMPlugin/RTMImageView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
#ifdef USE_BUILTIN_CAMERA_IMAGE_IDL
# include "deprecated/corba/CameraImage.hh"
#else
# include <rtm/idl/CameraCommonInterface.hh>
#if defined(OPENRTM_VERSION11)
# include <rtm/ext/CameraCommonInterface.hh>
#else
# include <rtm/idl/CameraCommonInterface.hh>
#endif
#endif
#include <rtm/DataInPort.h>

Expand Down
20 changes: 20 additions & 0 deletions src/OpenRTMPlugin/SimulationExecutionContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ SimulationExecutionContext::~SimulationExecutionContext()
}


#if defined(OPENRTM_VERSION11)
void SimulationExecutionContext::tick() throw (CORBA::SystemException)
#else
void SimulationExecutionContext::tick()
#endif
{
#if defined(OPENRTM_VERSION11)
std::for_each(m_comps.begin(), m_comps.end(), invoke_worker());
Expand All @@ -39,13 +43,21 @@ void SimulationExecutionContext::tick()
}


#if defined(OPENRTM_VERSION11)
int SimulationExecutionContext::svc(void) throw (CORBA::SystemException)
#else
int SimulationExecutionContext::svc(void)
#endif
{
return 0;
}


#if defined(OPENRTM_VERSION11)
RTC::ReturnCode_t SimulationExecutionContext::activate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException)
#else
RTC::ReturnCode_t SimulationExecutionContext::activate_component(RTC::LightweightRTObject_ptr comp)
#endif
{
#if defined(OPENRTM_VERSION11)

Expand Down Expand Up @@ -91,7 +103,11 @@ RTC::ReturnCode_t SimulationExecutionContext::activate_component(RTC::Lightweigh
}


#if defined(OPENRTM_VERSION11)
RTC::ReturnCode_t SimulationExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException)
#else
RTC::ReturnCode_t SimulationExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp)
#endif
{
#if defined(OPENRTM_VERSION11)

Expand Down Expand Up @@ -143,7 +159,11 @@ RTC::ReturnCode_t SimulationExecutionContext::deactivate_component(RTC::Lightwei
}


#if defined(OPENRTM_VERSION11)
RTC::ReturnCode_t SimulationExecutionContext::reset_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException)
#else
RTC::ReturnCode_t SimulationExecutionContext::reset_component(RTC::LightweightRTObject_ptr comp)
#endif
{
#if defined(OPENRTM_VERSION11)

Expand Down
8 changes: 8 additions & 0 deletions src/OpenRTMPlugin/SimulationExecutionContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,19 @@ class SimulationExecutionContext : public RTC::OpenHRPExecutionContext
public:
SimulationExecutionContext();
virtual ~SimulationExecutionContext(void);
#ifdef OPENRTM_VERSION11
virtual void tick(void) throw(CORBA::SystemException) override;
virtual int svc(void) throw(CORBA::SystemException);
virtual RTC::ReturnCode_t activate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException) override;
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException) override;
virtual RTC::ReturnCode_t reset_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException) override;
#else
virtual void tick(void) override;
virtual int svc(void);
virtual RTC::ReturnCode_t activate_component(RTC::LightweightRTObject_ptr comp) override;
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) override;
virtual RTC::ReturnCode_t reset_component(RTC::LightweightRTObject_ptr comp) override;
#endif
};

}
Expand Down
12 changes: 12 additions & 0 deletions src/OpenRTMPlugin/deprecated/ChoreonoidExecutionContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ ChoreonoidExecutionContext::~ChoreonoidExecutionContext()
}


#if defined(OPENRTM_VERSION11)
void ChoreonoidExecutionContext::tick() throw(CORBA::SystemException)
#else
void ChoreonoidExecutionContext::tick()
#endif
{
#if defined(OPENRTM_VERSION11)
std::for_each(m_comps.begin(), m_comps.end(), invoke_worker());
Expand All @@ -40,13 +44,21 @@ void ChoreonoidExecutionContext::tick()
}


#if defined(OPENRTM_VERSION11)
int ChoreonoidExecutionContext::svc(void) throw(CORBA::SystemException)
#else
int ChoreonoidExecutionContext::svc(void)
#endif
{
return 0;
}


#if defined(OPENRTM_VERSION11)
RTC::ReturnCode_t ChoreonoidExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException)
#else
RTC::ReturnCode_t ChoreonoidExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp)
#endif
{
#if defined(OPENRTM_VERSION11)
RTC_TRACE(("deactivate_component()"));
Expand Down
7 changes: 7 additions & 0 deletions src/OpenRTMPlugin/deprecated/ChoreonoidExecutionContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,16 @@ class ChoreonoidExecutionContext : public RTC::OpenHRPExecutionContext
public:
ChoreonoidExecutionContext();
virtual ~ChoreonoidExecutionContext(void);
#if defined(OPENRTM_VERSION11)
virtual void tick(void) throw(CORBA::SystemException) override;
virtual int svc(void) throw(CORBA::SystemException);
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException) override;
#else
virtual void tick(void) override;
virtual int svc(void);
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) override;
#endif

};

}
Expand Down
4 changes: 4 additions & 0 deletions src/OpenRTMPlugin/deprecated/ChoreonoidPeriodicExecutionContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ ChoreonoidPeriodicExecutionContext::~ChoreonoidPeriodicExecutionContext()
}


#if defined(OPENRTM_VERSION11)
RTC::ReturnCode_t ChoreonoidPeriodicExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException)
#else
RTC::ReturnCode_t ChoreonoidPeriodicExecutionContext::deactivate_component(RTC::LightweightRTObject_ptr comp)
#endif
{
#if defined(OPENRTM_VERSION11)
RTC_TRACE(("deactivate_component()"));
Expand Down
4 changes: 4 additions & 0 deletions src/OpenRTMPlugin/deprecated/ChoreonoidPeriodicExecutionContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class ChoreonoidPeriodicExecutionContext : public virtual RTC_exp::PeriodicExecu
public:
ChoreonoidPeriodicExecutionContext();
virtual ~ChoreonoidPeriodicExecutionContext(void);
#if defined(OPENRTM_VERSION11)
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) throw(CORBA::SystemException) override;
#else
virtual RTC::ReturnCode_t deactivate_component(RTC::LightweightRTObject_ptr comp) override;
#endif
};

}
Expand Down
6 changes: 5 additions & 1 deletion src/OpenRTMPlugin/deprecated/VirtualRobotPortHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
#ifdef USE_BUILTIN_CAMERA_IMAGE_IDL
# include <deprecated/corba/CameraImage.hh>
#else
# include <rtm/idl/CameraCommonInterface.hh>
#if defined(OPENRTM_VERSION11)
# include <rtm/ext/CameraCommonInterface.hh>
#else
# include <rtm/idl/CameraCommonInterface.hh>
#endif
#endif

#include "VirtualRobotPortHandler.h"
Expand Down