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.

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

Fix Windows compilation #1568

Merged
merged 3 commits into from
Dec 14, 2020
Merged

Fix Windows compilation #1568

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa90098
Use RVIZ_DEFAULT_PLUGIN_EXPORT for ScrewVisual
Tobias-Fischer Dec 8, 2020
4e8570e
Use RVIZ_DEFAULT_PLUGIN_EXPORT for ScrewDisplay
Tobias-Fischer Dec 8, 2020
ade19d1
Remove exports
rhaschke Dec 8, 2020
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
4 changes: 3 additions & 1 deletion src/rviz/default_plugin/screw_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include <geometry_msgs/TwistStamped.h>
#include <geometry_msgs/WrenchStamped.h>

#include "rviz/default_plugin/rviz_default_plugin_export.h"

namespace Ogre
{
class SceneNode;
Expand All @@ -29,7 +31,7 @@ namespace rviz
class ScrewVisual;

template <class MessageType>
class RVIZ_EXPORT ScrewDisplay : public rviz::MessageFilterDisplay<MessageType>
class RVIZ_DEFAULT_PLUGIN_EXPORT ScrewDisplay : public rviz::MessageFilterDisplay<MessageType>
{
public:
// Constructor. pluginlib::ClassLoader creates instances by calling
Expand Down
4 changes: 3 additions & 1 deletion src/rviz/default_plugin/screw_visual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <geometry_msgs/Vector3.h>
#include <OgrePrerequisites.h>

#include "rviz/default_plugin/rviz_default_plugin_export.h"

namespace rviz
{
class Arrow;
Expand All @@ -13,7 +15,7 @@ class BillboardLine;
namespace rviz
{
// ScrewVisual visualizes a single screw, i.e. a wrench, twist, or acceleration
class RVIZ_EXPORT ScrewVisual
class RVIZ_DEFAULT_PLUGIN_EXPORT ScrewVisual
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here as well.

{
public:
// Constructor. Creates the visual stuff and puts it into the scene, but in an unconfigured state.
Expand Down