Skip to content

Commit 4bf3ca5

Browse files
committed
Fix some issues with the export
- No need to export template functions - Expose some template instantiations
1 parent e9189ce commit 4bf3ca5

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

include/dynamic-graph/command-getter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace dynamicgraph {
5353
/// \li prototype of E::getParameter should be exactly as specified in this
5454
/// example.
5555
template <class E, typename T>
56-
class DYNAMIC_GRAPH_DLLAPI Getter : public Command {
56+
class Getter : public Command {
5757
public:
5858
/// Pointer to method that sets paramter of type T
5959
typedef T (E::*GetterMethod) () const;

include/dynamic-graph/command-setter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace dynamicgraph {
5353
/// \li prototype of E::setParameter should be exactly as specified in this
5454
/// example.
5555
template <class E, typename T>
56-
class DYNAMIC_GRAPH_DLLAPI Setter : public Command {
56+
class Setter : public Command {
5757
public:
5858
/// Pointer to method that sets paramter of type T
5959
typedef void (E::*SetterMethod) (const T&);

include/dynamic-graph/signal-cast-helper.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ namespace dynamicgraph
4848
: SignalCastRegisterer (typeid(T), disp, cast, trace)
4949
{}
5050

51-
DYNAMIC_GRAPH_DLLAPI
52-
static boost::any cast (std::istringstream& iss);
51+
static boost::any cast (std::istringstream& iss);
5352

5453
DYNAMIC_GRAPH_DLLAPI
5554
static void disp (const boost::any& object, std::ostream& os)

include/dynamic-graph/value.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,15 @@ namespace dynamicgraph {
115115
static const Value::Type TypeID;
116116
};
117117

118+
template<> const Value::Type ValueHelper<bool>::TypeID = Value::BOOL;
119+
template<> const Value::Type ValueHelper<unsigned>::TypeID = Value::UNSIGNED;
120+
template<> const Value::Type ValueHelper<int>::TypeID = Value::INT;
121+
template<> const Value::Type ValueHelper<float>::TypeID = Value::FLOAT;
122+
template<> const Value::Type ValueHelper<double>::TypeID = Value::DOUBLE;
123+
template<> const Value::Type ValueHelper<std::string>::TypeID = Value::STRING;
124+
template<> const Value::Type ValueHelper<Vector>::TypeID = Value::VECTOR;
125+
template<> const Value::Type ValueHelper<Matrix>::TypeID = Value::MATRIX;
126+
118127
} // namespace command
119128
} //namespace dynamicgraph
120129

src/command/value.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,5 @@ namespace dynamicgraph {
330330
return os;
331331
}
332332

333-
/* ---- HELPER ---------------------------------------------------------- */
334-
template<> const Value::Type ValueHelper<bool>::TypeID = Value::BOOL;
335-
template<> const Value::Type ValueHelper<unsigned>::TypeID = Value::UNSIGNED;
336-
template<> const Value::Type ValueHelper<int>::TypeID = Value::INT;
337-
template<> const Value::Type ValueHelper<float>::TypeID = Value::FLOAT;
338-
template<> const Value::Type ValueHelper<double>::TypeID = Value::DOUBLE;
339-
template<> const Value::Type ValueHelper<std::string>::TypeID = Value::STRING;
340-
template<> const Value::Type ValueHelper<Vector>::TypeID = Value::VECTOR;
341-
template<> const Value::Type ValueHelper<Matrix>::TypeID = Value::MATRIX;
342-
343333
} // namespace command
344334
} //namespace dynamicgraph

0 commit comments

Comments
 (0)