From fd18b5fba1e9d74e3191e3cf6b719c620d3401bb Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Mon, 12 Oct 2015 19:42:37 -0500
Subject: [PATCH] more clang sanctioned namespace fixups

---
 .../library/serverGame/src/shared/city/CityStructureInfo.h    | 4 ++--
 .../library/serverGame/src/shared/object/CellPermissions.h    | 4 ++--
 .../server/library/serverScript/src/shared/ScriptParameters.h | 2 +-
 .../shared/library/sharedGame/src/shared/core/WearableEntry.h | 4 ++--
 .../library/sharedGame/src/shared/quest/PlayerQuestData.h     | 4 ++--
 .../shared/library/sharedGame/src/shared/travel/TravelPoint.h | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h
index f99738da..13a090a6 100644
--- a/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h
+++ b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h
@@ -30,8 +30,8 @@ namespace Archive
 
 class CityStructureInfo
 {
-	friend void Archive::get(ReadIterator & source, CityStructureInfo & target);
-	friend void Archive::put(ByteStream & target, const CityStructureInfo & source);
+	friend void Archive::get(Archive::ReadIterator & source, CityStructureInfo & target);
+	friend void Archive::put(Archive::ByteStream & target, const CityStructureInfo & source);
 
 public:
 	bool operator== (const CityStructureInfo& rhs) const;
diff --git a/engine/server/library/serverGame/src/shared/object/CellPermissions.h b/engine/server/library/serverGame/src/shared/object/CellPermissions.h
index 8fcfccc3..d05703a7 100644
--- a/engine/server/library/serverGame/src/shared/object/CellPermissions.h
+++ b/engine/server/library/serverGame/src/shared/object/CellPermissions.h
@@ -48,8 +48,8 @@ namespace CellPermissions
 
 	class PermissionObject
 	{
-		friend void Archive::get( ReadIterator & source, CellPermissions::PermissionObject & target );
-		friend void Archive::put( ByteStream & target, const CellPermissions::PermissionObject & source );
+		friend void Archive::get( Archive::ReadIterator & source, CellPermissions::PermissionObject & target );
+		friend void Archive::put( Archive::ByteStream & target, const CellPermissions::PermissionObject & source );
 
 		friend class ::BuildingObject;
 		friend class ::CellObject;
diff --git a/engine/server/library/serverScript/src/shared/ScriptParameters.h b/engine/server/library/serverScript/src/shared/ScriptParameters.h
index dabb3269..98aa0870 100644
--- a/engine/server/library/serverScript/src/shared/ScriptParameters.h
+++ b/engine/server/library/serverScript/src/shared/ScriptParameters.h
@@ -210,7 +210,7 @@ public:
 	const stdvector<ValueDictionary>::fwd &                   getValueDictionaryArrayParam(int index) const;
 
 protected:
-	friend void Archive::get(ReadIterator & source, ScriptParams & target);
+	friend void Archive::get(Archive::ReadIterator & source, ScriptParams & target);
 
 private:
 
diff --git a/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h b/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h
index 6af2afdb..45432612 100644
--- a/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h
+++ b/engine/shared/library/sharedGame/src/shared/core/WearableEntry.h
@@ -28,8 +28,8 @@ namespace Archive
 
 class WearableEntry
 {
-	friend void Archive::get(ReadIterator & source, WearableEntry & target);
-	friend void Archive::put(ByteStream & target, const WearableEntry & source);
+	friend void Archive::get(Archive::ReadIterator & source, WearableEntry & target);
+	friend void Archive::put(Archive::ByteStream & target, const WearableEntry & source);
 
   public:
 	WearableEntry(const std::string&, int, const NetworkId&, int);
diff --git a/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h b/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h
index 6cd7e769..6a564e68 100644
--- a/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h
+++ b/engine/shared/library/sharedGame/src/shared/quest/PlayerQuestData.h
@@ -74,8 +74,8 @@ class PlayerQuestData
 	uint32 m_relativeAgeIndex;  // This is not meant to be persisted
 	bool   m_hasReceivedReward;
 
-	friend void Archive::get(ReadIterator & source, PlayerQuestData & target);
-	friend void Archive::put(ByteStream & target, const PlayerQuestData & source);
+	friend void Archive::get(Archive::ReadIterator & source, PlayerQuestData & target);
+	friend void Archive::put(Archive::ByteStream & target, const PlayerQuestData & source);
 };
 
 // ======================================================================
diff --git a/engine/shared/library/sharedGame/src/shared/travel/TravelPoint.h b/engine/shared/library/sharedGame/src/shared/travel/TravelPoint.h
index e90538dc..31d8180e 100644
--- a/engine/shared/library/sharedGame/src/shared/travel/TravelPoint.h
+++ b/engine/shared/library/sharedGame/src/shared/travel/TravelPoint.h
@@ -31,8 +31,8 @@ namespace Archive
 
 class TravelPoint
 {
-	friend void Archive::get(ReadIterator& source, TravelPoint& target);
-	friend void Archive::put(ByteStream& target, const TravelPoint& source);
+	friend void Archive::get(Archive::ReadIterator& source, TravelPoint& target);
+	friend void Archive::put(Archive::ByteStream& target, const TravelPoint& source);
 
 public: