Skip to content

Commit

Permalink
Actually wrap the right #include within the preprocessor check
Browse files Browse the repository at this point in the history
Follows up 791b0a3.
  • Loading branch information
PeterBowman committed May 18, 2017
1 parent 791b0a3 commit 8cc04cd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions programs/transCoordsUsingJoints/PremultPorts.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#include <yarp/os/Port.h>
#include <yarp/os/BufferedPort.h>

#include <yarp/dev/api.h>

// Temporary fix to avoid https://github.com/roboticslab-uc3m/kinematics-dynamics/issues/97
// Affects YARP 2.3.68 and 2.3.69-2.3.69.6
#include <yarp/conf/version.h>
Expand All @@ -18,10 +16,12 @@
#define __YARP_VERSION_N (__YARP_VERSION_N + YARP_VERSION_TWEAK)
#endif
#if __YARP_VERSION_N == 230680 || (__YARP_VERSION_N >= 230690 && __YARP_VERSION_N <= 230696)
#include <yarp/dev/IEncoders.h>
#include <yarp/dev/api.h>
#endif
#undef __YARP_VERSION_N

#include <yarp/dev/IEncoders.h>

#include <kdl/frames.hpp>
#include <kdl/chain.hpp>
#include <kdl/chainfksolverpos_recursive.hpp>
Expand Down

0 comments on commit 8cc04cd

Please sign in to comment.