From 0127f71e0f0f832343ac32e9d4d7ff86ca46c19d Mon Sep 17 00:00:00 2001
From: Francois Keith <francois.keith@gmail.com>
Date: Thu, 14 Apr 2011 18:18:44 +0200
Subject: [PATCH] Move the definition of some ValueHelper<...>::TypeId to avoid
link issues
---
include/dynamic-graph/value.h | 8 ++++++++
src/command/value.cpp | 11 -----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/include/dynamic-graph/value.h b/include/dynamic-graph/value.h
index 5630552a..aee37bf3 100644
--- a/include/dynamic-graph/value.h
+++ b/include/dynamic-graph/value.h
@@ -114,6 +114,14 @@ 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 677a317c..08d273b9 100644
--- a/src/command/value.cpp
+++ b/src/command/value.cpp
@@ -322,16 +322,5 @@ 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