From b4af7b089312def8e4aed7dc5c8b33644743c82b Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 3 Feb 2023 17:00:40 +0100
Subject: [PATCH] use explicit namespace qualification
---
SimoxUtility/json/eigen_conversion.cpp | 53 ++++++++++++--------------
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/SimoxUtility/json/eigen_conversion.cpp b/SimoxUtility/json/eigen_conversion.cpp
index 8018e507f..b5733f277 100644
--- a/SimoxUtility/json/eigen_conversion.cpp
+++ b/SimoxUtility/json/eigen_conversion.cpp
@@ -5,44 +5,41 @@
#include <Eigen/Geometry>
-namespace Eigen
+void Eigen::from_json(const ::simox::json::json& j, Eigen::Vector3f& vector)
{
- void from_json(const ::simox::json::json& j, Eigen::Vector3f& vector)
+ if (j.is_object())
{
- if (j.is_object())
- {
- vector.x() = j.at("x").get<float>();
- vector.y() = j.at("y").get<float>();
- vector.z() = j.at("z").get<float>();
- }
- else // j.is_array()
- {
- jsonbase::from_json(j, vector);
- }
+ vector.x() = j.at("x").get<float>();
+ vector.y() = j.at("y").get<float>();
+ vector.z() = j.at("z").get<float>();
+ }
+ else // j.is_array()
+ {
+ jsonbase::from_json(j, vector);
}
+}
- void from_json(const ::simox::json::json& j, Eigen::Matrix4f& matrix)
+void Eigen::from_json(const ::simox::json::json& j, Eigen::Matrix4f& matrix)
+{
+ if (j.is_object())
{
- if (j.is_object())
+ const auto& j_ori = j.at("ori");
+ Eigen::Matrix3f ori;
+
+ if (j_ori.is_object())
{
- const auto& j_ori = j.at("ori");
- Eigen::Matrix3f ori;
-
- if (j_ori.is_object())
- {
- ori = j_ori.get<Eigen::Quaternionf>().toRotationMatrix();
- }
- else
- {
- ori = j_ori.get<Eigen::Matrix3f>();
- }
-
- matrix = simox::math::pose(j.at("pos").get<Eigen::Vector3f>(), ori);
+ ori = j_ori.get<Eigen::Quaternionf>().toRotationMatrix();
}
else
{
- jsonbase::from_json(j, matrix);
+ ori = j_ori.get<Eigen::Matrix3f>();
}
+
+ matrix = simox::math::pose(j.at("pos").get<Eigen::Vector3f>(), ori);
+ }
+ else
+ {
+ jsonbase::from_json(j, matrix);
}
}
--
GitLab