Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
+5
-5
@@ -98,7 +98,7 @@ XNodeValue *XNode::GetAttr( const RString &attrname )
|
||||
|
||||
XNode *XNode::GetChild( const RString &sName )
|
||||
{
|
||||
multimap<RString, XNode*>::iterator by_name= m_children_by_name.lower_bound(sName);
|
||||
std::multimap<RString, XNode*>::iterator by_name= m_children_by_name.lower_bound(sName);
|
||||
if(by_name != m_children_by_name.end() &&
|
||||
sName == by_name->second->GetName())
|
||||
{
|
||||
@@ -121,7 +121,7 @@ bool XNode::PushChildValue( lua_State *L, const RString &sName ) const
|
||||
|
||||
const XNode *XNode::GetChild( const RString &sName ) const
|
||||
{
|
||||
multimap<RString, XNode*>::const_iterator by_name= m_children_by_name.lower_bound(sName);
|
||||
std::multimap<RString, XNode*>::const_iterator by_name= m_children_by_name.lower_bound(sName);
|
||||
if(by_name != m_children_by_name.end() &&
|
||||
sName == by_name->second->GetName())
|
||||
{
|
||||
@@ -153,7 +153,7 @@ bool XNode::RemoveChild(XNode *node, bool bDelete)
|
||||
|
||||
void XNode::RemoveChildFromByName(XNode* node)
|
||||
{
|
||||
multimap<RString, XNode*>::iterator by_name= m_children_by_name.lower_bound(node->m_sName);
|
||||
std::multimap<RString, XNode*>::iterator by_name= m_children_by_name.lower_bound(node->m_sName);
|
||||
if(by_name != m_children_by_name.end() &&
|
||||
node->GetName() == by_name->second->GetName())
|
||||
{
|
||||
@@ -192,7 +192,7 @@ bool XNode::RemoveAttr( const RString &sName )
|
||||
XNodeValue *XNode::AppendAttrFrom( const RString &sName, XNodeValue *pValue, bool bOverwrite )
|
||||
{
|
||||
DEBUG_ASSERT( sName.size() );
|
||||
pair<XAttrs::iterator,bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) );
|
||||
std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) );
|
||||
if( !ret.second ) // already existed
|
||||
{
|
||||
if( bOverwrite )
|
||||
@@ -214,7 +214,7 @@ XNodeValue *XNode::AppendAttrFrom( const RString &sName, XNodeValue *pValue, boo
|
||||
XNodeValue *XNode::AppendAttr( const RString &sName )
|
||||
{
|
||||
DEBUG_ASSERT( sName.size() );
|
||||
pair<XAttrs::iterator,bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) );
|
||||
std::pair<XAttrs::iterator, bool> ret = m_attrs.insert( make_pair(sName, (XNodeValue *) nullptr) );
|
||||
if( ret.second )
|
||||
ret.first->second = new XNodeStringValue;
|
||||
return ret.first->second; // already existed
|
||||
|
||||
Reference in New Issue
Block a user