From 81397a063282eed8dcdf8307765b988613c735dd Mon Sep 17 00:00:00 2001
From: Francois Keith <francois.keith@inrialpes.fr>
Date: Sat, 14 May 2011 23:11:26 +0200
Subject: [PATCH] Revert "Move the definition of some ValueHelper<...>::TypeId
to avoid link issues"
This solution worked only for win32 systems, and
created link errors for unix systems...
This reverts commit e7e487ebdf9c550742d4c9525bbb151e25437393.
---
include/dynamic-graph/value.h | 8 --------
src/command/value.cpp | 11 +++++++++++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/dynamic-graph/value.h b/include/dynamic-graph/value.h
index aee37bf3..5630552a 100644
--- a/include/dynamic-graph/value.h
+++ b/include/dynamic-graph/value.h
@@ -114,14 +114,6 @@ namespace dynamicgraph {
static const Value::Type TypeID;
};
- template<> const Value::Type ValueHelper<bool>::TypeID = Value::BOOL;
- template<> const Value::Type ValueHelper<unsigned>::TypeID = Value::UNSIGNED;
- template<> const Value::Type ValueHelper<int>::TypeID = Value::INT;
- template<> const Value::Type ValueHelper<float>::TypeID = Value::FLOAT;
- template<> const Value::Type ValueHelper<double>::TypeID = Value::DOUBLE;
- template<> const Value::Type ValueHelper<std::string>::TypeID = Value::STRING;
- template<> const Value::Type ValueHelper<Vector>::TypeID = Value::VECTOR;
- template<> const Value::Type ValueHelper<Matrix>::TypeID = Value::MATRIX;
} // namespace command
} //namespace dynamicgraph
diff --git a/src/command/value.cpp b/src/command/value.cpp
index 08d273b9..677a317c 100644
--- a/src/command/value.cpp
+++ b/src/command/value.cpp
@@ -322,5 +322,16 @@ namespace dynamicgraph {
}
return os;
}
+
+ /* ---- HELPER ---------------------------------------------------------- */
+ template<> const Value::Type ValueHelper<bool>::TypeID = Value::BOOL;
+ template<> const Value::Type ValueHelper<unsigned>::TypeID = Value::UNSIGNED;
+ template<> const Value::Type ValueHelper<int>::TypeID = Value::INT;
+ template<> const Value::Type ValueHelper<float>::TypeID = Value::FLOAT;
+ template<> const Value::Type ValueHelper<double>::TypeID = Value::DOUBLE;
+ template<> const Value::Type ValueHelper<std::string>::TypeID = Value::STRING;
+ template<> const Value::Type ValueHelper<Vector>::TypeID = Value::VECTOR;
+ template<> const Value::Type ValueHelper<Matrix>::TypeID = Value::MATRIX;
+
} // namespace command
} //namespace dynamicgraph
--
GitLab