oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)

Browse source
This commit is contained in:
Loïc Blot 2017-06-04 21:00:04 +02:00 • committed by GitHub
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server.h
View file

@ -135,7 +135,7 @@ struct ServerPlayingSound
{
ServerSoundParams params;
SimpleSoundSpec spec;
UNORDERED_SET<u16> clients; // peer ids
std::unordered_set<u16> clients; // peer ids
};
class Server : public con::PeerHandler, public MapEventReceiver,
@ -653,12 +653,12 @@ private:
u16 m_ignore_map_edit_events_peer_id;
// media files known to server
UNORDERED_MAP<std::string, MediaInfo> m_media;
std::unordered_map<std::string, MediaInfo> m_media;
/*
Sounds
*/
UNORDERED_MAP<s32, ServerPlayingSound> m_playing_sounds;
std::unordered_map<s32, ServerPlayingSound> m_playing_sounds;
s32 m_next_sound_id;
/*
@ -669,7 +669,7 @@ private:
// value = "" (visible to all players) or player name
std::map<std::string, std::string> m_detached_inventories_player;
UNORDERED_MAP<std::string, ModMetadata *> m_mod_storages;
std::unordered_map<std::string, ModMetadata *> m_mod_storages;
float m_mod_storage_save_timer;
DISABLE_CLASS_COPY(Server);