Merge branch 'main' into chapulina/4_to_5

gazebosim · Mar 19, 2021 · d8c8bda · d8c8bda
2 parents 34f640a + 636bad5
commit d8c8bda
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/include/ignition/gazebo/components/Factory.hh b/include/ignition/gazebo/components/Factory.hh
@@ -310,13 +310,11 @@ namespace components
     private: std::map<ComponentTypeId, StorageDescriptorBase *> storagesById;
 
     /// \brief A list of IDs and their equivalent names.
-    /// \detail Make it non-static on version 2.0.
-    public: inline static std::map<ComponentTypeId, std::string> namesById;
+    public: std::map<ComponentTypeId, std::string> namesById;
 
     /// \brief Keep track of the runtime names for types and warn the user if
     /// they try to register different types with the same typeName.
-    /// \detail Make it non-static on version 2.0.
-    public: inline static std::map<ComponentTypeId, std::string>
+    public: std::map<ComponentTypeId, std::string>
         runtimeNamesById;
   };