style fix.

gazebosim · Jan 30, 2019 · 7f46524 · 7f46524
1 parent 4f0519f
commit 7f46524
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 74 deletions.
diff --git a/gazebo/common/EnumIface.hh b/gazebo/common/EnumIface.hh
@@ -41,14 +41,14 @@ namespace gazebo
     #define GZ_ENUM(visibility, enumType, begin, end, ...) \
     template<> visibility enumType \
     common::EnumIface<enumType>::range[] = {begin, end}; \
-    template<> visibility \
-    std::vector<std::string> common::EnumIface<enumType>::names = {__VA_ARGS__};
+    template<> visibility std::vector<std::string> \
+    common::EnumIface<enumType>::names = {__VA_ARGS__};
 #else
     #define GZ_ENUM(visibility, enumType, begin, end, ...) \
     template<> enumType \
     common::EnumIface<enumType>::range[] = {begin, end}; \
-    template<> \
-    std::vector<std::string> common::EnumIface<enumType>::names = {__VA_ARGS__}; \
+    template<> std::vector<std::string> \
+    common::EnumIface<enumType>::names = {__VA_ARGS__}; \
     template class visibility common::EnumIface<enumType>;
 #endif
 

diff --git a/gazebo/common/FuelModelDatabase.hh b/gazebo/common/FuelModelDatabase.hh
@@ -34,7 +34,7 @@
 #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo::common::FuelModelDatabase)
+GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, FuelModelDatabase)
 
 namespace gazebo
 {

diff --git a/gazebo/common/MeshManager.hh b/gazebo/common/MeshManager.hh
@@ -33,7 +33,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo::common::MeshManager)
+GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, MeshManager)
 
 namespace gazebo
 {

diff --git a/gazebo/common/ModelDatabase.hh b/gazebo/common/ModelDatabase.hh
@@ -34,7 +34,7 @@
 #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo::common::ModelDatabase)
+GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, ModelDatabase)
 
 namespace gazebo
 {

diff --git a/gazebo/common/SingletonT.hh b/gazebo/common/SingletonT.hh
@@ -59,55 +59,19 @@ class SingletonT
 template <class T>
 T &SingletonT<T>::myself = SingletonT<T>::GetInstance();
 
-/// \brief Forward declarations for later explicit instantiation of typed SingletonT
-namespace gazebo
-{
-  namespace common
-  {
-    class FuelModelDatabase;
-    class MeshManager;
-    class ModelDatabase;
-    class SystemPaths;
-  }
-  namespace gui
-  {
-    class KeyEventHandler;
-    class ModelAlign;
-    class ModelManipulator;
-    class ModelSnap;
-    class MouseEventHandler;
-    class PlotManager;
-  }
-  namespace rendering
-  {
-    class RenderEngine;
-    class RTShaderSystem;
-  }
-  namespace sensors
-  {
-    class SensorManager;
-  }
-  namespace transport
-  {
-    class ConnectionManager;
-    class TopicManager;
-  }
-  namespace util
-  {
-    class DiagnosticManager;
-    class IntrospectionManager;
-    class LogPlay;
-    class LogRecord;
-    class OpenAL;
-  }
-}
-
 /// \brief Helper to declare typed SingletonT
 #ifdef __clang__
-#define GZ_SINGLETON_DECLARE(visibility, singletonType)
+#define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType)
 #else
-#define GZ_SINGLETON_DECLARE(visibility, singletonType) \
-template class visibility ::SingletonT<singletonType>;
+#define GZ_SINGLETON_DECLARE(visibility, n1, n2, singletonType) \
+namespace n1 \
+{ \
+  namespace n2 \
+  { \
+    class singletonType; \
+  } \
+} \
+template class visibility ::SingletonT<n1::n2::singletonType>;
 #endif
 
 /// \}

diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh
@@ -38,7 +38,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo::common::SystemPaths)
+GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, SystemPaths)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/KeyEventHandler.hh b/gazebo/gui/KeyEventHandler.hh
@@ -26,7 +26,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::KeyEventHandler)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, KeyEventHandler)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/ModelAlign.hh b/gazebo/gui/ModelAlign.hh
@@ -34,7 +34,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::ModelAlign)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelAlign)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/ModelManipulator.hh b/gazebo/gui/ModelManipulator.hh
@@ -32,7 +32,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::ModelManipulator)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelManipulator)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/ModelSnap.hh b/gazebo/gui/ModelSnap.hh
@@ -27,7 +27,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::ModelSnap)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelSnap)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/MouseEventHandler.hh b/gazebo/gui/MouseEventHandler.hh
@@ -26,7 +26,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::MouseEventHandler)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, MouseEventHandler)
 
 namespace gazebo
 {

diff --git a/gazebo/gui/plot/PlotManager.hh b/gazebo/gui/plot/PlotManager.hh
@@ -26,7 +26,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo::gui::PlotManager)
+GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, PlotManager)
 
 namespace gazebo
 {

diff --git a/gazebo/rendering/RTShaderSystem.hh b/gazebo/rendering/RTShaderSystem.hh
@@ -29,7 +29,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo::rendering::RTShaderSystem)
+GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RTShaderSystem)
 
 namespace gazebo
 {

diff --git a/gazebo/rendering/RenderEngine.hh b/gazebo/rendering/RenderEngine.hh
@@ -28,7 +28,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo::rendering::RenderEngine)
+GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RenderEngine)
 
 namespace Ogre
 {

diff --git a/gazebo/sensors/SensorFactory.hh b/gazebo/sensors/SensorFactory.hh
@@ -61,19 +61,21 @@ namespace gazebo
     /// \brief Register a sensor class (called by sensor registration function).
     /// \param[in] _className Name of class of sensor to register.
     /// \param[in] _factoryfn Function handle for registration.
-    public: GZ_SENSORS_VISIBLE static void RegisterSensor(const std::string &_className,
-                                       SensorFactoryFn _factoryfn);
+    public: GZ_SENSORS_VISIBLE static void RegisterSensor(
+      const std::string &_className, SensorFactoryFn _factoryfn);
 
     /// \brief Create a new instance of a sensor.  Used by the world when
     /// reading the world file.
     /// \param[in] _className Name of sensor class
     /// \return Pointer to Sensor
-    public: GZ_SENSORS_VISIBLE static SensorPtr NewSensor(const std::string &_className);
+    public: GZ_SENSORS_VISIBLE static SensorPtr NewSensor(
+      const std::string &_className);
 
     /// \brief Get all the sensor types
     /// \param _types Vector of strings of the sensor types,
     /// populated by function
-    public: GZ_SENSORS_VISIBLE static void GetSensorTypes(std::vector<std::string> &_types);
+    public: GZ_SENSORS_VISIBLE static void GetSensorTypes(
+      std::vector<std::string> &_types);
 
     /// \brief A list of registered sensor classes
     private: static std::map<std::string, SensorFactoryFn> sensorMap;

diff --git a/gazebo/sensors/SensorManager.hh b/gazebo/sensors/SensorManager.hh
@@ -32,7 +32,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_SENSORS_VISIBLE, gazebo::sensors::SensorManager)
+GZ_SINGLETON_DECLARE(GZ_SENSORS_VISIBLE, gazebo, sensors, SensorManager)
 
 namespace gazebo
 {

diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh
@@ -32,7 +32,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo::transport::ConnectionManager)
+GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, ConnectionManager)
 
 namespace gazebo
 {

diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh
@@ -41,7 +41,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo::transport::TopicManager)
+GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, TopicManager)
 
 namespace gazebo
 {

diff --git a/gazebo/util/Diagnostics.hh b/gazebo/util/Diagnostics.hh
@@ -30,7 +30,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo::util::DiagnosticManager)
+GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, DiagnosticManager)
 
 namespace gazebo
 {

diff --git a/gazebo/util/IntrospectionManager.hh b/gazebo/util/IntrospectionManager.hh
@@ -32,7 +32,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo::util::IntrospectionManager)
+GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, IntrospectionManager)
 
 namespace gazebo
 {

diff --git a/gazebo/util/LogPlay.hh b/gazebo/util/LogPlay.hh
@@ -25,7 +25,7 @@
 #include "gazebo/util/system.hh"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo::util::LogPlay)
+GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogPlay)
 
 namespace gazebo
 {

diff --git a/gazebo/util/LogRecord.hh b/gazebo/util/LogRecord.hh
@@ -28,7 +28,7 @@
 #define GZ_LOG_VERSION "1.0"
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo::util::LogRecord)
+GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogRecord)
 
 namespace gazebo
 {

diff --git a/gazebo/util/OpenAL.hh b/gazebo/util/OpenAL.hh
@@ -34,7 +34,7 @@
 #ifdef HAVE_OPENAL
 
 /// \brief Explicit instantiation for typed SingletonT.
-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo::util::OpenAL)
+GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, OpenAL)
 
 namespace gazebo
 {