diff --git a/src/SongManager.h b/src/SongManager.h index 31f7414f80..4b6f9fff11 100644 --- a/src/SongManager.h +++ b/src/SongManager.h @@ -20,9 +20,9 @@ struct lua_State; #include "RageUtil.h" #include "Song.h" #include +#include #include - RString SONG_GROUP_COLOR_NAME( size_t i ); RString COURSE_GROUP_COLOR_NAME( size_t i ); bool CompareNotesPointersForExtra(const Steps *n1, const Steps *n2); @@ -147,7 +147,7 @@ public: void GetPreferredSortSongs( std::vector &AddTo ) const; std::map> GetPreferredSortSongsMap() const { return m_mapPreferredSectionToSongs;}; RString SongToPreferredSortSectionName( const Song *pSong ) const; - std::unordered_map GetGroupGroupMap() const { return m_mapNameToGroup;}; + std::unordered_map GetGroupGroupMap() const { return m_mapNameToGroup;}; std::map> GetSeriesGroupMap() const { return m_mapSeriesToGroups;}; Group* GetGroupFromName( const RString &sGroupName ) const; Group* GetGroup( const Song *pSong ) const; @@ -250,8 +250,8 @@ protected: std::vector m_sSongGroupBannerPaths; // each song group may have a banner associated with it //vector m_sSongGroupBackgroundPaths; // each song group may have a background associated with it (very rarely) - std::unordered_map m_mapNameToGroup; // maps a group's name on disk (folder) to a Group object - std::map> m_mapSeriesToGroups; + std::unordered_map m_mapNameToGroup; // maps a group's name on disk (folder) to a Group object + std::map> m_mapSeriesToGroups; struct Comp { bool operator()(const RString& s, const RString &t) const { return CompareRStringsAsc(s,t); } }; typedef std::vector SongPointerVector;