From 93c02c09894bfaf6f25deda491ee1690778c3859 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Sun, 19 Dec 2010 02:13:40 +0100
Subject: [PATCH] Fix naming.
---
.gitignore | 3 ++-
src/ros_export.hxx | 4 ++--
src/ros_import.hxx | 4 ++--
src/sot_to_ros.hh | 12 ++++++------
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0061e71..d1cf030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
lib/
msg/lisp/
+msg/java/
msg_gen/
-src/dynamic_graph/
+src/dynamic_graph_bridge/
bin/
diff --git a/src/ros_export.hxx b/src/ros_export.hxx
index 236ead6..3423835 100644
--- a/src/ros_export.hxx
+++ b/src/ros_export.hxx
@@ -4,8 +4,8 @@
# include <boost/bind.hpp>
# include <jrl/mal/boost.hh>
# include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
namespace ml = maal::boost;
diff --git a/src/ros_import.hxx b/src/ros_import.hxx
index 3b8b502..57f7ccc 100644
--- a/src/ros_import.hxx
+++ b/src/ros_import.hxx
@@ -2,8 +2,8 @@
# define DYNAMIC_GRAPH_ROS_IMPORT_HXX
# include <vector>
# include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
# include "sot_to_ros.hh"
diff --git a/src/sot_to_ros.hh b/src/sot_to_ros.hh
index f5ac0cd..3253aac 100644
--- a/src/sot_to_ros.hh
+++ b/src/sot_to_ros.hh
@@ -3,8 +3,8 @@
# include <vector>
# include <jrl/mal/boost.hh>
# include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
namespace dynamicgraph
{
@@ -27,8 +27,8 @@ namespace dynamicgraph
struct SotToRos<ml::Matrix>
{
typedef ml::Matrix sot_t;
- typedef dynamic_graph::Matrix ros_t;
- typedef dynamic_graph::MatrixConstPtr ros_const_ptr_t;
+ typedef dynamic_graph_bridge::Matrix ros_t;
+ typedef dynamic_graph_bridge::MatrixConstPtr ros_const_ptr_t;
typedef dynamicgraph::SignalTimeDependent<sot_t, int> signal_t;
typedef boost::function<sot_t& (sot_t&, int)> callback_t;
};
@@ -37,8 +37,8 @@ namespace dynamicgraph
struct SotToRos<ml::Vector>
{
typedef ml::Vector sot_t;
- typedef dynamic_graph::Vector ros_t;
- typedef dynamic_graph::VectorConstPtr ros_const_ptr_t;
+ typedef dynamic_graph_bridge::Vector ros_t;
+ typedef dynamic_graph_bridge::VectorConstPtr ros_const_ptr_t;
typedef dynamicgraph::SignalTimeDependent<sot_t, int> signal_t;
typedef boost::function<sot_t& (sot_t&, int)> callback_t;
};
--
GitLab