From: <geo...@us...> - 2011-10-15 16:30:20
|
Revision: 4390 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4390&view=rev Author: geoffthemedio Date: 2011-10-15 16:30:14 +0000 (Sat, 15 Oct 2011) Log Message: ----------- Added missing #include to ObjectMap.h. Modified Paths: -------------- trunk/FreeOrion/universe/ObjectMap.h Modified: trunk/FreeOrion/universe/ObjectMap.h =================================================================== --- trunk/FreeOrion/universe/ObjectMap.h 2011-10-15 08:05:27 UTC (rev 4389) +++ trunk/FreeOrion/universe/ObjectMap.h 2011-10-15 16:30:14 UTC (rev 4390) @@ -4,6 +4,7 @@ #include <map> #include <vector> +#include <string> #include <boost/serialization/access.hpp> |
From: <geo...@us...> - 2011-10-16 09:12:56
|
Revision: 4395 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4395&view=rev Author: geoffthemedio Date: 2011-10-16 09:12:50 +0000 (Sun, 16 Oct 2011) Log Message: ----------- Grooming Modified Paths: -------------- trunk/FreeOrion/universe/ObjectMap.h Modified: trunk/FreeOrion/universe/ObjectMap.h =================================================================== --- trunk/FreeOrion/universe/ObjectMap.h 2011-10-16 03:55:20 UTC (rev 4394) +++ trunk/FreeOrion/universe/ObjectMap.h 2011-10-16 09:12:50 UTC (rev 4395) @@ -110,7 +110,7 @@ * Copy or Clone functions of the copied UniverseObjects. Any objects * in this ObjectMap that have no corresponding object in \a copied_map * are left unchanged. */ - void Copy(const ObjectMap& copied_map, int empire_id = ALL_EMPIRES); + void Copy(const ObjectMap& copied_map, int empire_id = ALL_EMPIRES); /** Copies the passed \a object into this ObjectMap, overwriting any * existing information about that object or creating a new object in this @@ -119,7 +119,7 @@ * another empire id is specified, then the copied informatio is limited * by passed that \a empire_id to Copy or Clone of the object. The * passed object is unchanged. */ - void Copy(const UniverseObject* obj, int empire_id = ALL_EMPIRES); + void Copy(const UniverseObject* obj, int empire_id = ALL_EMPIRES); /** Copies the objects of the ObjectMap \a copied_map that are visible to * the empire with id \a empire_id into this ObjectMap. Copied objects @@ -129,7 +129,7 @@ * the empire with id \a empire_id are left unchanged. If \a empire_id is * ALL_EMPIRES, then all objects in \a copied_map are copied completely * and this function acts just like ObjectMap::Copy .*/ - void CompleteCopyVisible(const ObjectMap& copied_map, int empire_id = ALL_EMPIRES); + void CompleteCopyVisible(const ObjectMap& copied_map, int empire_id = ALL_EMPIRES); /** Adds object \a obj to the map under id \a id if id is a valid object id * and obj is an object with that id set. If there already was an object @@ -137,28 +137,28 @@ * is returned. This ObjectMap takes ownership of the passed * UniverseObject. The caller takes ownership of any returned * UniverseObject. */ - UniverseObject* Insert(int id, UniverseObject* obj); + UniverseObject* Insert(int id, UniverseObject* obj); /** Removes object with id \a id from map, and returns that object, if * there was an object under that ID in the map. If no such object * existed in the map, 0 is returned and nothing is removed. The caller * takes ownership of any returned UniverseObject. */ - UniverseObject* Remove(int id); + UniverseObject* Remove(int id); /** Removes object with id \a id from map, and deletes that object, if * there was an object under that ID in the map. If no such object * existed in the map, nothing is done. */ - void Delete(int id); + void Delete(int id); /** Empties map and deletes all objects within. */ - void Clear(); + void Clear(); /** Swaps the contents of *this with \a rhs. */ - void swap(ObjectMap& rhs); + void swap(ObjectMap& rhs); //@} private: - void CopyObjectsToConstObjects(); + void CopyObjectsToConstObjects(); std::map<int, UniverseObject*> m_objects; std::map<int, const UniverseObject*> m_const_objects; |
From: <geo...@us...> - 2011-11-20 08:14:36
|
Revision: 4496 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4496&view=rev Author: geoffthemedio Date: 2011-11-20 08:14:30 +0000 (Sun, 20 Nov 2011) Log Message: ----------- class forward declare changed to struct. Modified Paths: -------------- trunk/FreeOrion/universe/ObjectMap.h Modified: trunk/FreeOrion/universe/ObjectMap.h =================================================================== --- trunk/FreeOrion/universe/ObjectMap.h 2011-11-20 08:13:55 UTC (rev 4495) +++ trunk/FreeOrion/universe/ObjectMap.h 2011-11-20 08:14:30 UTC (rev 4496) @@ -10,7 +10,7 @@ class Universe; class UniverseObject; -class UniverseObjectVisitor; +struct UniverseObjectVisitor; extern const int ALL_EMPIRES; |