Skip to content
Snippets Groups Projects
Commit b13307df authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Annotate some functions as inline

parent 8b1aadf0
No related branches found
No related tags found
No related merge requests found
......@@ -197,7 +197,7 @@ namespace armarx
//NJointControllerWithTripleBuffer<ControlDataStruct>
template <typename ControlDataStruct>
void NJointControllerWithTripleBuffer<ControlDataStruct>::rtSwapBufferAndRun(
inline void NJointControllerWithTripleBuffer<ControlDataStruct>::rtSwapBufferAndRun(
const IceUtil::Time& sensorValuesTimestamp,
const IceUtil::Time& timeSinceLastIteration)
{
......@@ -206,19 +206,19 @@ namespace armarx
}
template <typename ControlDataStruct>
const ControlDataStruct& NJointControllerWithTripleBuffer<ControlDataStruct>::rtGetControlStruct() const
inline const ControlDataStruct& NJointControllerWithTripleBuffer<ControlDataStruct>::rtGetControlStruct() const
{
return controlDataTripleBuffer.getReadBuffer();
}
template <typename ControlDataStruct>
bool NJointControllerWithTripleBuffer<ControlDataStruct>::rtUpdateControlStruct()
inline bool NJointControllerWithTripleBuffer<ControlDataStruct>::rtUpdateControlStruct()
{
return controlDataTripleBuffer.updateReadBuffer();
}
template <typename ControlDataStruct>
void NJointControllerWithTripleBuffer<ControlDataStruct>::writeControlStruct()
inline void NJointControllerWithTripleBuffer<ControlDataStruct>::writeControlStruct()
{
//just lock to be save and reduce the impact of an error
//also this allows code to unlock the mutex before calling this function
......@@ -228,13 +228,13 @@ namespace armarx
}
template <typename ControlDataStruct>
ControlDataStruct& NJointControllerWithTripleBuffer<ControlDataStruct>::getWriterControlStruct()
inline ControlDataStruct& NJointControllerWithTripleBuffer<ControlDataStruct>::getWriterControlStruct()
{
return controlDataTripleBuffer.getWriteBuffer();
}
template <typename ControlDataStruct>
void NJointControllerWithTripleBuffer<ControlDataStruct>::setControlStruct(const ControlDataStruct& newStruct)
inline void NJointControllerWithTripleBuffer<ControlDataStruct>::setControlStruct(const ControlDataStruct& newStruct)
{
LockGuardType lock {controlDataMutex};
getWriterControlStruct() = newStruct;
......@@ -242,7 +242,7 @@ namespace armarx
}
template <typename ControlDataStruct>
void NJointControllerWithTripleBuffer<ControlDataStruct>::reinitTripleBuffer(const ControlDataStruct& initial)
inline void NJointControllerWithTripleBuffer<ControlDataStruct>::reinitTripleBuffer(const ControlDataStruct& initial)
{
controlDataTripleBuffer.reinitAllBuffers(initial);
}
......@@ -251,7 +251,7 @@ namespace armarx
namespace armarx
{
template<class ItT>
boost::optional<std::vector<char>> NJointController::AreNotInConflict(ItT first, ItT last)
inline boost::optional<std::vector<char>> NJointController::AreNotInConflict(ItT first, ItT last)
{
if (first == last)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment