From 28bf007ade05861f47bddc5e9dd64cb6a55b1cf0 Mon Sep 17 00:00:00 2001 From: Andy Getz Date: Wed, 21 Apr 2021 00:25:12 -0400 Subject: [PATCH] Qualify `gazebo::util` in `using namespace` declarations. This avoids ambiguity in the presence of a top-level namespace named util, e.g. https://godbolt.org/z/WMfseEGPf. --- gazebo/util/Diagnostics.cc | 2 +- gazebo/util/IntrospectionClient.cc | 2 +- gazebo/util/IntrospectionManager.cc | 2 +- gazebo/util/LogPlay.cc | 2 +- gazebo/util/LogRecord.cc | 2 +- gazebo/util/OpenAL.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gazebo/util/Diagnostics.cc b/gazebo/util/Diagnostics.cc index 5432b247f4..1b3b4dc054 100644 --- a/gazebo/util/Diagnostics.cc +++ b/gazebo/util/Diagnostics.cc @@ -26,7 +26,7 @@ #include "gazebo/util/Diagnostics.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; ////////////////////////////////////////////////// DiagnosticManager::DiagnosticManager() diff --git a/gazebo/util/IntrospectionClient.cc b/gazebo/util/IntrospectionClient.cc index 01239b762c..4998760cf1 100644 --- a/gazebo/util/IntrospectionClient.cc +++ b/gazebo/util/IntrospectionClient.cc @@ -30,7 +30,7 @@ #include "gazebo/util/IntrospectionClientPrivate.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; ////////////////////////////////////////////////// IntrospectionClient::IntrospectionClient() diff --git a/gazebo/util/IntrospectionManager.cc b/gazebo/util/IntrospectionManager.cc index e19439570b..048e605317 100644 --- a/gazebo/util/IntrospectionManager.cc +++ b/gazebo/util/IntrospectionManager.cc @@ -30,7 +30,7 @@ #include "gazebo/util/IntrospectionManagerPrivate.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; ////////////////////////////////////////////////// IntrospectionManager::IntrospectionManager() diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc index 9fbde6462a..e0b80b381f 100644 --- a/gazebo/util/LogPlay.cc +++ b/gazebo/util/LogPlay.cc @@ -46,7 +46,7 @@ #include "gazebo/util/LogPlay.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; ///////////////////////////////////////////////// LogPlay::LogPlay() diff --git a/gazebo/util/LogRecord.cc b/gazebo/util/LogRecord.cc index 027b96a313..e1e2543ffc 100644 --- a/gazebo/util/LogRecord.cc +++ b/gazebo/util/LogRecord.cc @@ -56,7 +56,7 @@ #include "gazebo/util/LogRecord.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; ////////////////////////////////////////////////// LogRecord::LogRecord() diff --git a/gazebo/util/OpenAL.cc b/gazebo/util/OpenAL.cc index 04864a73de..faeb2adf32 100644 --- a/gazebo/util/OpenAL.cc +++ b/gazebo/util/OpenAL.cc @@ -42,7 +42,7 @@ #include "gazebo/util/OpenAL.hh" using namespace gazebo; -using namespace util; +using namespace gazebo::util; #ifdef HAVE_OPENAL /////////////////////////////////////////////////