Commit 30766413 authored by Olivier Stasse's avatar Olivier Stasse

Fix EXPORT MACROS in headers.

Suggestion by Gabriele.
parent 215e43d3
......@@ -23,12 +23,12 @@
#if defined (WIN32)
# if defined (admittance_controller_EXPORTS)
# define ADMITTANCECONTROLLER_EXPORT __declspec(dllexport)
# define SIMPLEADMITTANCECONTROLLER_EXPORT __declspec(dllexport)
# else
# define ADMITTANCECONTROLLER_EXPORT __declspec(dllimport)
# define SIMPLEADMITTANCECONTROLLER_EXPORT __declspec(dllimport)
# endif
#else
# define ADMITTANCECONTROLLER_EXPORT
# define SIMPLEADMITTANCECONTROLLER_EXPORT
#endif
......@@ -48,7 +48,7 @@ namespace dynamicgraph {
/* --- CLASS ----------------------------------------------------------- */
/* --------------------------------------------------------------------- */
class ADMITTANCECONTROLLER_EXPORT SimpleAdmittanceController
class SIMPLEADMITTANCECONTROLLER_EXPORT SimpleAdmittanceController
: public ::dynamicgraph::Entity
{
DYNAMIC_GRAPH_ENTITY_DECL();
......
......@@ -23,12 +23,12 @@
#if defined (WIN32)
# if defined (base_estimator_EXPORTS)
# define SOTBASEESTIMATOR_EXPORT __declspec(dllexport)
# define TALOS_BASE_ESTIMATOR_EXPORT __declspec(dllexport)
# else
# define SOTBASEESTIMATOR_EXPORT __declspec(dllimport)
# define TALOS_BASE_ESTIMATOR_EXPORT __declspec(dllimport)
# endif
#else
# define SOTBASEESTIMATOR_EXPORT
# define TALOS_BASE_ESTIMATOR_EXPORT
#endif
......@@ -82,7 +82,7 @@ namespace dynamicgraph {
/** Avoids singularity while taking the mean of euler angles**/
double wEulerMean(double a1, double a2, double w1, double w2);
class SOTBASEESTIMATOR_EXPORT TalosBaseEstimator
class TALOS_BASE_ESTIMATOR_EXPORT TalosBaseEstimator
:public::dynamicgraph::Entity
{
typedef TalosBaseEstimator EntityClassName;
......
......@@ -23,12 +23,12 @@
#if defined (WIN32)
# if defined (__sot_torque_control_control_manager_H__)
# define SOTCONTROLMANAGER_EXPORT __declspec(dllexport)
# define TALOS_CONTROL_MANAGER_EXPORT __declspec(dllexport)
# else
# define SOTCONTROLMANAGER_EXPORT __declspec(dllimport)
# define TALOS_CONTROL_MANAGER_EXPORT __declspec(dllimport)
# endif
#else
# define SOTCONTROLMANAGER_EXPORT
# define TALOS_CONTROL_MANAGER_EXPORT
#endif
......@@ -70,7 +70,7 @@ namespace dynamicgraph {
return os;
}
class SOTCONTROLMANAGER_EXPORT TalosControlManager
class TALOS_CONTROL_MANAGER_EXPORT TalosControlManager
:public::dynamicgraph::Entity
{
typedef Eigen::VectorXd::Index Index;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment