FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SGSubsytem name compatibility for other compilers;

Browse Source 
changed to use const char* rather than const std::string & as this doesn't work on GCC; and besides std::string converts nicely to const char* and most of the times this is used it is actually a string literal.
This commit is contained in:
Richard Harrison
2019-03-01 19:00:43 +01:00
parent 7e969f4e28
commit 846f024e91
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/structure/subsystem_mgr.cxx
+2 -2
View File
@@ -232,7 +232,7 @@ public:
SGSubsystemGroup::SGSubsystemGroup(const std::string &name) : SGSubsystemGroup::SGSubsystemGroup(const char *name) :
_fixedUpdateTime(-1.0), _fixedUpdateTime(-1.0),
_updateTimeRemainder(0.0), _updateTimeRemainder(0.0),
_initPosition(-1) _initPosition(-1)
@@ -837,7 +837,7 @@ namespace {
} // end of anonymous namespace } // end of anonymous namespace
SGSubsystemMgr::SGSubsystemMgr (const std::string &name) : SGSubsystemMgr::SGSubsystemMgr (const char *name) :
_groups(MAX_GROUPS) _groups(MAX_GROUPS)
{ {
if (global_defaultSubsystemManager == nullptr) { if (global_defaultSubsystemManager == nullptr) {
simgear/structure/subsystem_mgr.hxx
+2 -2
View File
@@ -378,7 +378,7 @@ typedef SGSharedPtr<SGSubsystem> SGSubsystemRef;
class SGSubsystemGroup : public SGSubsystem class SGSubsystemGroup : public SGSubsystem
{ {
public: public:
SGSubsystemGroup (const std::string &name); SGSubsystemGroup (const char *name);
virtual ~SGSubsystemGroup (); virtual ~SGSubsystemGroup ();
void init() override; void init() override;
@@ -501,7 +501,7 @@ public:
MAX_GROUPS MAX_GROUPS
}; };
SGSubsystemMgr (const std::string &name); SGSubsystemMgr (const char *name);
virtual ~SGSubsystemMgr (); virtual ~SGSubsystemMgr ();
void init () override; void init () override;