Skip to content

Commit e8bc298

Browse files
author
Francois Keith
committed
[Windows] Correct macro and export.
In windows, the deprecated flag should be placed before the function declaration. Also, correct macro name for dllimport.
1 parent cfec44e commit e8bc298

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

include/sot/core/feature-abstract.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ namespace dynamicgraph {
189189
virtual std::ostream & writeGraph(std::ostream & os) const;
190190

191191
/// Return true for children that provide the errordot output signal
192-
virtual bool withErrorDot( void ) const SOT_CORE_DEPRECATED
192+
SOT_CORE_DEPRECATED virtual bool withErrorDot( void ) const
193193
{
194194
return true;
195195
}

include/sot/core/joint-trajectory-entity.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace ml= maal::boost;
3737
// API
3838

3939
#if defined (WIN32)
40-
# if defined (sot_joint_trajectory_entity_EXPORTS)
40+
# if defined (joint_trajectory_entity_EXPORTS)
4141
# define SOTJOINT_TRAJECTORY_ENTITY_EXPORT __declspec(dllexport)
4242
# else
4343
# define SOTJOINT_TRAJECTORY_ENTITY_EXPORT __declspec(dllimport)

include/sot/core/kalman.hh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,28 @@
3333
#include <dynamic-graph/linear-algebra.h>
3434
#include <sot/core/constraint.hh>
3535

36+
/* -------------------------------------------------------------------------- */
37+
/* --- API ------------------------------------------------------------------ */
38+
/* -------------------------------------------------------------------------- */
39+
40+
#if defined (WIN32)
41+
# if defined (kalman_EXPORTS)
42+
# define SOT_KALMAN_EXPORT __declspec(dllexport)
43+
# else
44+
# define SOT_KALMAN_EXPORT __declspec(dllimport)
45+
# endif
46+
#else
47+
# define SOT_KALMAN_EXPORT
48+
#endif
49+
3650
/* -------------------------------------------------------------------------- */
3751
/* --- CLASSE --------------------------------------------------------------- */
3852
/* -------------------------------------------------------------------------- */
3953

4054
namespace dynamicgraph {
4155
namespace sot {
4256

43-
class SOT_CORE_EXPORT Kalman
57+
class SOT_KALMAN_EXPORT Kalman
4458
:public Entity
4559
{
4660
public:

0 commit comments

Comments
 (0)