From 59dbdd66ddb2a4028bbdc26e6b8b3a63b187ddab Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 12 Oct 2015 18:30:49 -0500 Subject: [PATCH] more clang namespace fixes --- engine/server/library/serverGame/src/shared/city/CityInfo.h | 4 ++-- .../src/shared/gameGameServer/AiCreatureStateMessage.h | 2 +- .../src/shared/gameGameServer/AiMovementMessage.h | 2 +- .../server/library/serverUtility/src/shared/PopulationList.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/city/CityInfo.h b/engine/server/library/serverGame/src/shared/city/CityInfo.h index 52b041af..3fa70946 100644 --- a/engine/server/library/serverGame/src/shared/city/CityInfo.h +++ b/engine/server/library/serverGame/src/shared/city/CityInfo.h @@ -34,8 +34,8 @@ namespace Archive class CityInfo { - friend void Archive::get(ReadIterator & source, CityInfo & target); - friend void Archive::put(ByteStream & target, const CityInfo & source); + friend void Archive::get(Archive::ReadIterator & source, CityInfo & target); + friend void Archive::put(Archive::ByteStream & target, const CityInfo & source); public: CityInfo(); diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h index 9addbd87..11d83177 100644 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h @@ -30,7 +30,7 @@ class AiCreatureStateMessage : public MessageQueue::Data { CONTROLLER_MESSAGE_INTERFACE; - friend void Archive::get(ReadIterator & source, AiCreatureStateMessage & target); + friend void Archive::get(Archive::ReadIterator & source, AiCreatureStateMessage & target); public: diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h index 7cec0cf4..7cc7d9d4 100644 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h @@ -35,7 +35,7 @@ class AiMovementMessage : public MessageQueue::Data { CONTROLLER_MESSAGE_INTERFACE; - friend void Archive::get(ReadIterator & source, AiMovementMessage & target); + friend void Archive::get(Archive::ReadIterator & source, AiMovementMessage & target); public: AiMovementMessage(); diff --git a/engine/server/library/serverUtility/src/shared/PopulationList.h b/engine/server/library/serverUtility/src/shared/PopulationList.h index 9f4a2115..7a6bccd6 100644 --- a/engine/server/library/serverUtility/src/shared/PopulationList.h +++ b/engine/server/library/serverUtility/src/shared/PopulationList.h @@ -70,8 +70,8 @@ class PopulationList PopulationMapType m_populationMap; mutable PopulationMapType m_populationCache; - friend void Archive::get(ReadIterator & source, PopulationList & target); - friend void Archive::put(ByteStream & target, const PopulationList & source); + friend void Archive::get(Archive::ReadIterator & source, PopulationList & target); + friend void Archive::put(Archive::ByteStream & target, const PopulationList & source); }; // ======================================================================