Menu
▾
▴
[Performous-commit] Lasse Karkkainen : C++11 compatibility. Do not give template parameters to std::make_pair. If you want to specify types, call std::pair constructor directly; make_pair is a helper function for automatically determining the types.
|
From: Lasse Kärkkäi. <tr...@us...> - 2012-11-05 07:40:53
|
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Nov 5 09:40:09 2012 +0200
C++11 compatibility. Do not give template parameters to std::make_pair. If you want to specify types, call std::pair constructor directly; make_pair is a helper function for automatically determining the types.
---
game/joystick.cc | 16 ++++++++--------
game/song.hh | 2 +-
game/songparser-xml.cc | 14 +++++++-------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/game/joystick.cc b/game/joystick.cc
index 21285e1..7da7aff 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -60,7 +60,7 @@ input::MidiDrums::MidiDrums(): stream(pm::findDevice(true, config["game/midi_inp
readConfig(map, getConfigDir() / "mididrums.xml");
while (detail::devices.find(devnum) != detail::devices.end()) ++devnum;
- detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(devnum, detail::InputDevPrivate(g_instruments.find("DRUMS_GUITARHERO")->second)));
+ detail::devices.insert(std::make_pair(devnum, detail::InputDevPrivate(g_instruments.find("DRUMS_GUITARHERO")->second)));
event.type = Event::PRESS;
for (unsigned int i = 0; i < BUTTONS; ++i) event.pressed[i] = false;
}
@@ -320,7 +320,7 @@ void readControllers(input::Instruments &instruments, fs::path const& file) {
input::Instrument instrument(name, devType, mapping);
instrument.match = regexp;
instrument.description = description;
- instruments.insert(std::make_pair<std::string, input::Instrument>(name, instrument));
+ instruments.insert(std::make_pair(name, instrument));
}
} catch (XMLError& e) {
int line = e.elem.get_line();
@@ -395,14 +395,14 @@ void input::SDL::init() {
std::cout << ", Hats: " << SDL_JoystickNumHats(joy) << std::endl;
if( forced_type.find(i) != forced_type.end() ) {
std::cout << " Detected as: " << forced_type.find(i)->second.description << " (forced)" << std::endl;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(i, input::detail::InputDevPrivate(forced_type.find(i)->second)));
+ input::detail::devices.insert(std::make_pair(i, input::detail::InputDevPrivate(forced_type.find(i)->second)));
} else {
bool found = false;
for(input::Instruments::const_iterator it = g_instruments.begin() ; it != g_instruments.end() ; ++it) {
boost::regex sdl_name(it->second.match);
if (regex_search(name.c_str(), sdl_name)) {
std::cout << " Detected as: " << it->second.description << std::endl;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(i, input::detail::InputDevPrivate(it->second)));
+ input::detail::devices.insert(std::make_pair(i, input::detail::InputDevPrivate(it->second)));
found = true;
break;
}
@@ -422,13 +422,13 @@ void input::SDL::init() {
std::clog << "controllers/info: Keyboard as dance pad controller: " << (config["game/keyboard_dancepad"].b() ? "enabled":"disabled") << std::endl;
std::clog << "controllers/info: Keyboard as keyboard controller: " << (config["game/keyboard_keyboard"].b() ? "enabled":"disabled") << std::endl;
input::SDL::sdl_devices[input::detail::KEYBOARD_ID] = NULL;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(input::detail::KEYBOARD_ID, input::detail::InputDevPrivate(g_instruments.find("GUITAR_GUITARHERO")->second)));
+ input::detail::devices.insert(std::make_pair(input::detail::KEYBOARD_ID, input::detail::InputDevPrivate(g_instruments.find("GUITAR_GUITARHERO")->second)));
input::SDL::sdl_devices[input::detail::KEYBOARD_ID2] = NULL;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(input::detail::KEYBOARD_ID2, input::detail::InputDevPrivate(g_instruments.find("DRUMS_GUITARHERO")->second)));
+ input::detail::devices.insert(std::make_pair(input::detail::KEYBOARD_ID2, input::detail::InputDevPrivate(g_instruments.find("DRUMS_GUITARHERO")->second)));
input::SDL::sdl_devices[input::detail::KEYBOARD_ID3] = NULL;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(input::detail::KEYBOARD_ID3, input::detail::InputDevPrivate(g_instruments.find("DANCEPAD_GENERIC")->second)));
+ input::detail::devices.insert(std::make_pair(input::detail::KEYBOARD_ID3, input::detail::InputDevPrivate(g_instruments.find("DANCEPAD_GENERIC")->second)));
input::SDL::sdl_devices[input::detail::KEYBOARD_ID4] = NULL;
- input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(input::detail::KEYBOARD_ID4, input::detail::InputDevPrivate(g_instruments.find("KEYBOARD_GENERIC")->second)));
+ input::detail::devices.insert(std::make_pair(input::detail::KEYBOARD_ID4, input::detail::InputDevPrivate(g_instruments.find("KEYBOARD_GENERIC")->second)));
}
bool input::SDL::pushEvent(SDL_Event _e) {
diff --git a/game/song.hh b/game/song.hh
index a2b1b73..f219412 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -61,7 +61,7 @@ class Song: boost::noncopyable {
int randomIdx; ///< sorting index used for random order
void insertVocalTrack(std::string vocalTrack, VocalTrack track) {
eraseVocalTrack(vocalTrack);
- vocalTracks.insert(std::make_pair<std::string, VocalTrack>(vocalTrack, track));
+ vocalTracks.insert(std::make_pair(vocalTrack, track));
}
void eraseVocalTrack(std::string vocalTrack = TrackName::LEAD_VOCAL) {
vocalTracks.erase(vocalTrack);
diff --git a/game/songparser-xml.cc b/game/songparser-xml.cc
index 3237011..ab4580d 100644
--- a/game/songparser-xml.cc
+++ b/game/songparser-xml.cc
@@ -184,9 +184,9 @@ void SongParser::xmlParse() {
std::string artist = name;
if(trackNode.get_attribute("Artist")) artist = trackNode.get_attribute("Artist")->get_value();
if(name == "Player1") {
- singerList.insert(std::make_pair<std::string, std::string>("Solo 1", artist));
+ singerList.insert(std::make_pair("Solo 1", artist));
} else if(name == "Player2") {
- singerList.insert(std::make_pair<std::string, std::string>("Solo 2", artist));
+ singerList.insert(std::make_pair("Solo 2", artist));
} else {
std::cout << "Unknown track name: " << name << std::endl;
}
@@ -209,7 +209,7 @@ void SongParser::xmlParse() {
singers += " & " + it->second;
}
}
- sentencesList.insert(std::make_pair<std::string, xmlpp::NodeSet>(singers, sentences));
+ sentencesList.insert(std::make_pair(singers, sentences));
} else {
xmlpp::NodeSet tracks;
if (!dom.find("/ss:MELODY/ss:TRACK", tracks)) throw std::runtime_error("Unable to find any sentences in melody XML");
@@ -217,7 +217,7 @@ void SongParser::xmlParse() {
xmlpp::Element& trackNode = dynamic_cast<xmlpp::Element&>(**it);
std::string singer = trackNode.get_attribute("Artist")->get_value();
dom.find(trackNode, "ss:SENTENCE", sentences);
- sentencesList.insert(std::make_pair<std::string, xmlpp::NodeSet>(singer, sentences));
+ sentencesList.insert(std::make_pair(singer, sentences));
}
}
}
@@ -228,18 +228,18 @@ void SongParser::xmlParse() {
// Add group track
std::string trackSinger = sentencesList.begin()->first;
VocalTrack vocalBoth(trackSinger);
- vocalTracks.insert(std::make_pair<std::string, VocalTrack>(trackSinger, vocalBoth));
+ vocalTracks.insert(std::make_pair(trackSinger, vocalBoth));
// add each singer track
for(std::map<std::string, std::string>::const_iterator it = singerList.begin() ; it != singerList.end() ; ++it) {
trackSinger = it->second;
VocalTrack vocal(trackSinger);
- vocalTracks.insert(std::make_pair<std::string, VocalTrack>(trackSinger, vocal));
+ vocalTracks.insert(std::make_pair(trackSinger, vocal));
}
} else {
for(std::map<std::string, xmlpp::NodeSet>::const_iterator it = sentencesList.begin() ; it != sentencesList.end() ; ++it) {
std::string trackSinger = it->first;
VocalTrack vocal(trackSinger);
- vocalTracks.insert(std::make_pair<std::string, VocalTrack>(trackSinger, vocal));
+ vocalTracks.insert(std::make_pair(trackSinger, vocal));
}
}
|