fix namespaces

follows stack-of-tasks/sot-core#148
loco-3d · Jul 23, 2020 · 6b52d22 · 6b52d22
1 parent 7028c14
commit 6b52d22
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 8 deletions.
diff --git a/include/sot/talos_balance/qualisys-client.hh b/include/sot/talos_balance/qualisys-client.hh
@@ -50,6 +50,7 @@
 
 namespace dynamicgraph {
 namespace sot {
+namespace dg = dynamicgraph;
 namespace talos_balance {
 
 /* --------------------------------------------------------------------- */

diff --git a/include/sot/talos_balance/robot/fwd.hh b/include/sot/talos_balance/robot/fwd.hh
@@ -19,6 +19,7 @@
 #define __invdyn_robots_fwd_hpp__
 namespace dynamicgraph {
 namespace sot {
+namespace dg = dynamicgraph;
 namespace talos_balance {
 namespace robots {
 class RobotWrapper;

diff --git a/include/sot/talos_balance/talos-control-manager.hh b/include/sot/talos_balance/talos-control-manager.hh
@@ -43,6 +43,7 @@
 
 namespace dynamicgraph {
 namespace sot {
+namespace dg = dynamicgraph;
 namespace talos_balance {
 
 /* --------------------------------------------------------------------- */

diff --git a/src/ft-calibration.cpp b/src/ft-calibration.cpp
@@ -15,8 +15,6 @@
 
 #define CALIB_ITER_TIME 1000  // Iteration needed for sampling and averaging the FT sensors while calibrating
 
-using namespace sot::talos_balance;
-
 namespace dynamicgraph {
 namespace sot {
 namespace talos_balance {

diff --git a/src/ft-wrist-calibration.cpp b/src/ft-wrist-calibration.cpp
@@ -16,8 +16,6 @@
 
 #define CALIB_ITER_TIME 1000  // Iteration needed for sampling and averaging the FT sensors while calibrating
 
-using namespace sot::talos_balance;
-
 namespace dynamicgraph {
 namespace sot {
 namespace talos_balance {

diff --git a/src/qualisys-client.cpp b/src/qualisys-client.cpp
@@ -16,8 +16,6 @@
 // #include "RTProtocol.h"
 // #include "RTPacket.h"
 
-using namespace sot::talos_balance;
-
 namespace dynamicgraph {
 namespace sot {
 namespace talos_balance {

diff --git a/src/talos-control-manager.cpp b/src/talos-control-manager.cpp
@@ -22,12 +22,11 @@
 #include <sot/core/stop-watch.hh>
 #include <sot/talos_balance/utils/statistics.hh>
 
-using namespace sot::talos_balance;
-
 namespace dynamicgraph {
 namespace sot {
 namespace talos_balance {
 namespace dynamicgraph = ::dynamicgraph;
+namespace dg = dynamicgraph;
 using namespace dynamicgraph;
 using namespace dynamicgraph::command;
 using namespace std;