more clang sanctioned namespace fixups

This commit is contained in:
DarthArgus
2015-10-12 19:42:37 -05:00
parent 42cb87d831
commit fd18b5fba1
6 changed files with 11 additions and 11 deletions
@@ -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;
@@ -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;
@@ -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:
@@ -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);
@@ -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);
};
// ======================================================================
@@ -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: