actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prefix some calls with std::

Browse Source 
These depend on C++ argument dependent name lookup and won't work with
an upcoming cleanup.
This commit is contained in:
Arthur Eubanks
2025-04-22 23:19:28 -07:00
committed by teejusb
parent 9dc5cea91d
commit 9131dc6b68
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LuaManager.cpp
+1 -1
View File
@@ -660,7 +660,7 @@ XNode *LuaHelpers::GetLuaInformation()
{ {
RString sNamespace; RString sNamespace;
LuaHelpers::Pop( L, sNamespace ); LuaHelpers::Pop( L, sNamespace );
if( find(BuiltInPackages, end, sNamespace) != end ) if( std::find(BuiltInPackages, end, sNamespace) != end )
continue; continue;
std::vector<RString> &vNamespaceFunctions = mNamespaces[sNamespace]; std::vector<RString> &vNamespaceFunctions = mNamespaces[sNamespace];
FOREACH_LUATABLE( L, -1 ) FOREACH_LUATABLE( L, -1 )
src/SongManager.cpp
+1 -1
View File
@@ -2124,7 +2124,7 @@ void SongManager::AddSongToList(Song* new_song)
m_pSongs.push_back(new_song); m_pSongs.push_back(new_song);
RString dir= new_song->GetSongDir(); RString dir= new_song->GetSongDir();
dir.MakeLower(); dir.MakeLower();
m_SongsByDir.insert(make_pair(dir, new_song)); m_SongsByDir.insert(std::make_pair(dir, new_song));
} }
void SongManager::FreeAllLoadedFromProfile( ProfileSlot slot ) void SongManager::FreeAllLoadedFromProfile( ProfileSlot slot )
src/XmlFile.cpp
+4 -4
View File
@@ -133,7 +133,7 @@ const XNode *XNode::GetChild( const RString &sName ) const
XNode *XNode::AppendChild( XNode *node ) XNode *XNode::AppendChild( XNode *node )
{ {
DEBUG_ASSERT( node->m_sName.size() ); DEBUG_ASSERT( node->m_sName.size() );
m_children_by_name.insert(make_pair(node->m_sName, node)); m_children_by_name.insert(std::make_pair(node->m_sName, node));
m_childs.push_back( node ); m_childs.push_back( node );
return node; return node;
} }
@@ -171,7 +171,7 @@ void XNode::RemoveChildFromByName(XNode* node)
void XNode::RenameChildInByName(XNode* node) void XNode::RenameChildInByName(XNode* node)
{ {
RemoveChildFromByName(node); RemoveChildFromByName(node);
m_children_by_name.insert(make_pair(node->m_sName, node)); m_children_by_name.insert(std::make_pair(node->m_sName, node));
} }
@@ -192,7 +192,7 @@ bool XNode::RemoveAttr( const RString &sName )
XNodeValue *XNode::AppendAttrFrom( const RString &sName, XNodeValue *pValue, bool bOverwrite ) XNodeValue *XNode::AppendAttrFrom( const RString &sName, XNodeValue *pValue, bool bOverwrite )
{ {
DEBUG_ASSERT( sName.size() ); DEBUG_ASSERT( sName.size() );
std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) ); std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( std::make_pair(sName, (XNodeValue *) nullptr) );
if( !ret.second ) // already existed if( !ret.second ) // already existed
{ {
if( bOverwrite ) if( bOverwrite )
@@ -214,7 +214,7 @@ XNodeValue *XNode::AppendAttrFrom( const RString &sName, XNodeValue *pValue, boo
XNodeValue *XNode::AppendAttr( const RString &sName ) XNodeValue *XNode::AppendAttr( const RString &sName )
{ {
DEBUG_ASSERT( sName.size() ); DEBUG_ASSERT( sName.size() );
std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) ); std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( std::make_pair(sName, (XNodeValue *) nullptr) );
if( ret.second ) if( ret.second )
ret.first->second = new XNodeStringValue; ret.first->second = new XNodeStringValue;
return ret.first->second; // already existed return ret.first->second; // already existed