Optimizations with GCC 4.8 lib

source/Actor.cpp

@@ -107,9 +107,8 @@ void Actor::initialize()
 {
 	for (const auto& value : API::values)
 	{
-		// emplace
-		actor_Values.insert(make_pair(value.second, Value<float>()));
-		actor_BaseValues.insert(make_pair(value.second, Value<float>()));
+		actor_Values.emplace(value.second, Value<float>());
+		actor_BaseValues.emplace(value.second, Value<float>());
 	}
 
 #ifdef VAULTMP_DEBUG
@@ -341,9 +340,8 @@ pPacket Actor::toPacket() const
 
 	for (const auto& value : actor_Values)
 	{
-		// emplace
-		values.insert(make_pair(value.first, this->GetActorValue(value.first)));
-		baseValues.insert(make_pair(value.first, this->GetActorBaseValue(value.first)));
+		values.emplace(value.first, this->GetActorValue(value.first));
+		baseValues.emplace(value.first, this->GetActorBaseValue(value.first));
 	}
 
 	pPacket pContainerNew = Container::toPacket();

source/GameFactory.hpp

@@ -316,8 +316,7 @@ struct GameFactory::Get_<T, RakNet::NetworkID> {
 				if (it == instances.end())
 					result[i] = VaultException("Unknown object with NetworkID %llu", id);
 				else
-					// emplace
-					sort.insert(make_pair(*it, i));
+					sort.emplace(*it, i);
 
 				++i;
 			}
@@ -412,8 +411,7 @@ RakNet::NetworkID GameFactory::Create(Args&&... args)
 
 	cs.Operate([id, type, &base]() {
 		++typecount[type];
-		// emplace
-		index[id] = instances.insert(make_pair(std::move(base), type)).first;
+		index[id] = instances.emplace(std::move(base), type).first;
 	});
 
 	return id;

source/Player.cpp

@@ -66,9 +66,8 @@ Player::~Player() noexcept
 
 void Player::initialize()
 {
-	// emplace
 	for (auto control : API::controls)
-		player_Controls.insert(make_pair(control, make_pair(Value<unsigned char>(), Value<bool>(true))));
+		player_Controls.emplace(control, make_pair(Value<unsigned char>(), Value<bool>(true)));
 
 #ifdef VAULTSERVER
 	baseIDs.Operate([this](BaseIDTracker& baseIDs) {

source/ServerEntry.cpp

@@ -15,8 +15,7 @@ void ServerEntry::SetServerMap(const string& map)
 void ServerEntry::SetServerRule(const string& rule, const string& value)
 {
 	this->rules.erase(rule);
-	// emplace
-	this->rules.insert(make_pair(rule, value));
+	this->rules.emplace(rule, value);
 }
 
 void ServerEntry::SetServerPlayers(const pair<unsigned int, unsigned int>& players)

source/vaultserver/Client.cpp

@@ -12,9 +12,8 @@ stack<unsigned int> Client::clientID;
 Client::Client(RakNetGUID guid, NetworkID player) : guid(guid), player(player)
 {
 	cs.Operate([guid, this]() {
-		// emplace
 		ID = clientID.top();
-		clients.insert(make_pair(guid, this));
+		clients.emplace(guid, this);
 		clientID.pop();
 	});
 }