From 7d0c58540103e9182ba584b440b91068df03a49c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 24 Jul 2015 14:08:44 +0200
Subject: standardize on not using "using namespace {cv,std}"

---
 ftnoir_tracker_aruco/include/board.h            | 2 +-
 ftnoir_tracker_aruco/include/boarddetector.h    | 3 +--
 ftnoir_tracker_aruco/include/cameraparameters.h | 3 ++-
 ftnoir_tracker_aruco/include/marker.h           | 2 +-
 ftnoir_tracker_aruco/include/markerdetector.h   | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'ftnoir_tracker_aruco/include')

diff --git a/ftnoir_tracker_aruco/include/board.h b/ftnoir_tracker_aruco/include/board.h
index c1d792925..ec7dd43fb 100644
--- a/ftnoir_tracker_aruco/include/board.h
+++ b/ftnoir_tracker_aruco/include/board.h
@@ -32,8 +32,8 @@ or implied, of Rafael Muñoz Salinas.
 #include <vector>
 #include "exports.h"
 #include "marker.h"
-using namespace std;
 namespace aruco {
+using namespace std;
 /**
  * 3d representation of a marker
  */
diff --git a/ftnoir_tracker_aruco/include/boarddetector.h b/ftnoir_tracker_aruco/include/boarddetector.h
index a0ee2361a..619b47982 100644
--- a/ftnoir_tracker_aruco/include/boarddetector.h
+++ b/ftnoir_tracker_aruco/include/boarddetector.h
@@ -32,11 +32,10 @@ or implied, of Rafael Muñoz Salinas.
 #include "board.h"
 #include "cameraparameters.h"
 #include "markerdetector.h"
-using namespace std;
 
 namespace aruco
 {
-
+using namespace std;
 /**\brief This class detects AR boards
  * Version 1.2
  * There are two modes for board detection.
diff --git a/ftnoir_tracker_aruco/include/cameraparameters.h b/ftnoir_tracker_aruco/include/cameraparameters.h
index a419afbe0..083d5f96e 100644
--- a/ftnoir_tracker_aruco/include/cameraparameters.h
+++ b/ftnoir_tracker_aruco/include/cameraparameters.h
@@ -30,9 +30,10 @@ or implied, of Rafael Muñoz Salinas.
 #include "exports.h"
 #include <opencv2/core/core.hpp>
 #include <string>
-using namespace std;
+
 namespace aruco
 {
+using namespace std;
 /**\brief Parameters of the camera
  */
 
diff --git a/ftnoir_tracker_aruco/include/marker.h b/ftnoir_tracker_aruco/include/marker.h
index 899610028..efc3e5fe6 100644
--- a/ftnoir_tracker_aruco/include/marker.h
+++ b/ftnoir_tracker_aruco/include/marker.h
@@ -32,8 +32,8 @@ or implied, of Rafael Muñoz Salinas.
 #include <opencv2/core/core.hpp>
 #include "exports.h"
 #include "cameraparameters.h"
-using namespace std;
 namespace aruco {
+using namespace std;
 /**\brief This class represents a marker. It is a vector of the fours corners ot the marker
  *
  */
diff --git a/ftnoir_tracker_aruco/include/markerdetector.h b/ftnoir_tracker_aruco/include/markerdetector.h
index 8a351f7ca..ac120b18a 100644
--- a/ftnoir_tracker_aruco/include/markerdetector.h
+++ b/ftnoir_tracker_aruco/include/markerdetector.h
@@ -33,11 +33,10 @@ or implied, of Rafael Muñoz Salinas.
 #include "cameraparameters.h"
 #include "exports.h"
 #include "marker.h"
-using namespace std;
 
 namespace aruco
 {
-
+using namespace std;
 /**\brief Main class for marker detection
  *
  */
-- 
cgit v1.2.3