From 48fdc2fe768141a65163bdf5894ea9d437090e9c Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Mon, 14 Feb 2011 09:16:21 +0100
Subject: [PATCH] Use api.hh.
---
include/sot/core/device.hh | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
index 0e267e47..05d9ab38 100644
--- a/include/sot/core/device.hh
+++ b/include/sot/core/device.hh
@@ -31,20 +31,7 @@ namespace ml= maal::boost;
#include <dynamic-graph/entity.h>
#include <dynamic-graph/all-signals.h>
#include <sot-core/vector-roll-pitch-yaw.h>
-
-/* --------------------------------------------------------------------- */
-/* --- API ------------------------------------------------------------- */
-/* --------------------------------------------------------------------- */
-
-#if defined(WIN32)
-# if defined(robot_simu_EXPORTS)
-# define SOTDEVICE_EXPORT __declspec(dllexport)
-# else
-# define SOTDEVICE_EXPORT __declspec(dllimport)
-# endif
-#else
-# define SOTDEVICE_EXPORT
-#endif
+#include "sot/core/api.hh"
namespace dynamicgraph {
namespace sot {
@@ -53,7 +40,7 @@ namespace dynamicgraph {
/* --- CLASS ----------------------------------------------------------- */
/* --------------------------------------------------------------------- */
- class SOTDEVICE_EXPORT Device
+ class SOT_CORE_EXPORT Device
:public Entity
{
public:
@@ -86,7 +73,7 @@ namespace dynamicgraph {
public: /* --- DISPLAY --- */
virtual void display(std::ostream& os) const;
- SOTDEVICE_EXPORT friend std::ostream&
+ SOT_CORE_EXPORT friend std::ostream&
operator<<(std::ostream& os,const Device& r) {
r.display(os); return os;
}
--
GitLab