Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove static for maps from Factory.hh #635

Merged
merged 8 commits into from
Mar 19, 2021
Merged

Remove static for maps from Factory.hh #635

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6722f9e
Remove static for maps from Factory.hh
shameekganguly Feb 18, 2021
2c4700a
Bugfix for inline keyword in Factory.hh
shameekganguly Feb 23, 2021
c0453bc
Merge branch 'ign-gazebo4' into ign-gazebo4
mjcarroll Feb 23, 2021
948e4b7
Merge branch 'ign-gazebo4' into ign-gazebo4
shameekganguly Feb 23, 2021
b961ca2
Merge branch 'ign-gazebo4' into ign-gazebo4
mjcarroll Feb 25, 2021
a860d3a
Merge branch 'ign-gazebo4' into ign-gazebo4
mjcarroll Mar 2, 2021
68ff096
Merge branch 'main' into ign-gazebo4
mjcarroll Mar 8, 2021
7497e36
Merge branch 'main' into ign-gazebo4
chapulina Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions include/ignition/gazebo/components/Factory.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down