From ebe60c9eb79084cd85d0745ab49d56b692c3fe4a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 27 Jun 2005 05:24:24 +0000
Subject: [PATCH] simplify

---
 stepmania/src/BGAnimation.cpp     | 2 +-
 stepmania/src/IniFile.cpp         | 2 +-
 stepmania/src/NotesLoaderBMS.cpp  | 2 +-
 stepmania/src/RageFileManager.cpp | 2 +-
 stepmania/src/XmlFile.cpp         | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 7dfd5907d0..1c6f4021a4 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -140,7 +140,7 @@ void BGAnimation::LoadFromAniDir( const CString &_sAniDir, bool bGeneric )
 		if( pScrollerNode )
 		{
 			FOREACH_Attr( pScrollerNode, pAttr )
-				pBGAnimation->m_attrs.insert( pair<CString,XAttr*>(pAttr->m_sName, pAttr) );
+				pBGAnimation->m_attrs.insert( make_pair(pAttr->m_sName, pAttr) );
 			// Clear the copies in the Scroller node so that we don't double-delete.
 			pScrollerNode->m_attrs.clear();	
 		}
diff --git a/stepmania/src/IniFile.cpp b/stepmania/src/IniFile.cpp
index 81a9494913..b7624aad7b 100644
--- a/stepmania/src/IniFile.cpp
+++ b/stepmania/src/IniFile.cpp
@@ -181,7 +181,7 @@ bool IniFile::RenameKey(const CString &from, const CString &to)
 	m_childs.erase( it );
 
 	pNode->m_sName = to;
-	m_childs.insert( pair<CString,XNode*>(pNode->m_sName,pNode) );
+	m_childs.insert( make_pair(pNode->m_sName, pNode) );
 
 	return true;
 }
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index f8cc3965bd..69ef28c861 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -543,7 +543,7 @@ bool BMSLoader::ReadBMSFile( const CString &sPath, NameToData_t &mapNameToData )
 			value_data = line.substr( iIndexOfSeparator+1 );
 
 		value_name.MakeLower();
-		mapNameToData.insert( pair<CString,CString>(value_name, value_data) );
+		mapNameToData.insert( make_pair(value_name, value_data) );
 	}
 
 	return true;
diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp
index cf708331fa..baa012ebaf 100644
--- a/stepmania/src/RageFileManager.cpp
+++ b/stepmania/src/RageFileManager.cpp
@@ -791,7 +791,7 @@ RageFileBasic *RageFileManager::OpenForWriting( CString sPath, int mode, int &er
 		if( value == -1 )
 			continue;
 
-		Values.push_back( pair<int,int>( i, value ) );
+		Values.push_back( make_pair( i, value ) );
 	}
 
 	stable_sort( Values.begin(), Values.end(), SortBySecond );
diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp
index 0268afa0f2..37ee027997 100644
--- a/stepmania/src/XmlFile.cpp
+++ b/stepmania/src/XmlFile.cpp
@@ -215,7 +215,7 @@ char* XNode::LoadAttributes( const char* pszAttrs, PARSEINFO *pi /*= &piDefault*
 		
 		// add new attribute
 		DEBUG_ASSERT( attr->m_sName.size() );
-		m_attrs.insert( pair<CString,XAttr*>(attr->m_sName, attr) );
+		m_attrs.insert( make_pair(attr->m_sName, attr) );
 		xml = pEnd;
 		
 		// XML Attr Value
@@ -410,7 +410,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ )
 			if( !node->m_sName.empty() )
 			{
 				DEBUG_ASSERT( node->m_sName.size() );
-				m_childs.insert( pair<CString,XNode*>(node->m_sName, node) );
+				m_childs.insert( make_pair(node->m_sName, node) );
 			}
 			else
 			{
@@ -853,7 +853,7 @@ bool XNode::RemoveChild( XNode *node )
 XAttr *XNode::AppendAttr( XAttr *attr )
 {
 	DEBUG_ASSERT( attr->m_sName.size() );
-	m_attrs.insert( pair<CString,XAttr*>(attr->m_sName,attr) );
+	m_attrs.insert( make_pair(attr->m_sName,attr) );
 	return attr;
 }