From a650a6f8b1fb68da84b2fab17fedfbbe26d407cb Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Tue, 5 Jan 2021 10:43:31 -0500
Subject: [PATCH] add std namespacing

---
 gtsam/geometry/Pose3.cpp    | 4 ++--
 gtsam/geometry/SOn-inl.h    | 4 +---
 gtsam/sfm/ShonanAveraging.h | 4 ++--
 gtsam/slam/dataset.h        | 8 ++++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/gtsam/geometry/Pose3.cpp b/gtsam/geometry/Pose3.cpp
index 22849d4f5..c183e32ed 100644
--- a/gtsam/geometry/Pose3.cpp
+++ b/gtsam/geometry/Pose3.cpp
@@ -106,8 +106,8 @@ Vector6 Pose3::adjointTranspose(const Vector6& xi, const Vector6& y,
 }
 
 /* ************************************************************************* */
-void Pose3::print(const string& s) const {
-  cout << (s.empty() ? s : s + " ") << *this << endl;
+void Pose3::print(const std::string& s) const {
+  std::cout << (s.empty() ? s : s + " ") << *this << std::endl;
 }
 
 /* ************************************************************************* */
diff --git a/gtsam/geometry/SOn-inl.h b/gtsam/geometry/SOn-inl.h
index 6180f4cc7..284ae76de 100644
--- a/gtsam/geometry/SOn-inl.h
+++ b/gtsam/geometry/SOn-inl.h
@@ -22,8 +22,6 @@
 
 #include <iostream>
 
-using namespace std;
-
 namespace gtsam {
 
 // Implementation for N>=5 just uses dynamic version
@@ -108,7 +106,7 @@ typename SO<N>::VectorN2 SO<N>::vec(
 
 template <int N>
 void SO<N>::print(const std::string& s) const {
-    cout << s << matrix_ << endl;
+    std::cout << s << matrix_ << std::endl;
 }
 
 }  // namespace gtsam
diff --git a/gtsam/sfm/ShonanAveraging.h b/gtsam/sfm/ShonanAveraging.h
index edd9f33a2..f1ce31fa6 100644
--- a/gtsam/sfm/ShonanAveraging.h
+++ b/gtsam/sfm/ShonanAveraging.h
@@ -354,7 +354,7 @@ class ShonanAveraging2 : public ShonanAveraging<2> {
  public:
   ShonanAveraging2(const Measurements &measurements,
                    const Parameters &parameters = Parameters());
-  explicit ShonanAveraging2(string g2oFile,
+  explicit ShonanAveraging2(std::string g2oFile,
                             const Parameters &parameters = Parameters());
 };
 
@@ -362,7 +362,7 @@ class ShonanAveraging3 : public ShonanAveraging<3> {
  public:
   ShonanAveraging3(const Measurements &measurements,
                    const Parameters &parameters = Parameters());
-  explicit ShonanAveraging3(string g2oFile,
+  explicit ShonanAveraging3(std::string g2oFile,
                             const Parameters &parameters = Parameters());
 
   // TODO(frank): Deprecate after we land pybind wrapper
diff --git a/gtsam/slam/dataset.h b/gtsam/slam/dataset.h
index d96c11167..80877c136 100644
--- a/gtsam/slam/dataset.h
+++ b/gtsam/slam/dataset.h
@@ -303,8 +303,8 @@ struct SfmTrack {
 
   /// print
   void print(const std::string& s = "") const {
-    cout << "Track with " << measurements.size();
-    cout << " measurements of point " << p << "\n";
+    std::cout << "Track with " << measurements.size();
+    std::cout << " measurements of point " << p << std::endl;
   }
 };
 
@@ -385,8 +385,8 @@ struct SfmData {
 
   /// print
   void print(const std::string& s = "") const {
-    cout << "Number of cameras = " << number_cameras() << "\n";
-    cout << "Number of tracks = " << number_tracks() << "\n";
+    std::cout << "Number of cameras = " << number_cameras() << std::endl;
+    std::cout << "Number of tracks = " << number_tracks() << std::endl;
   }
 };