Removed STLport requirement

This commit is contained in:
Anonymous
2014-01-23 00:16:13 -07:00
parent a9ac73d4e5
commit fac1f2c5ae
173 changed files with 454 additions and 479 deletions
@@ -102,6 +102,5 @@ target_link_libraries(PlanetServer
localizationArchive
unicode
unicodeArchive
${STLPORT_LIBRARIES}
${CMAKE_DL_LIBS}
)
@@ -10,8 +10,8 @@
// ======================================================================
#include <hash_map>
#include <hash_set>
#include <tr1/unordered_map>
#include <tr1/unordered_set>
#include <string>
#include <set>
@@ -93,9 +93,9 @@ class Scene : public Singleton2<Scene>, public MessageDispatch::Receiver
Coordinates();
};
typedef std::hash_map<NetworkId, PlanetProxyObject*, NetworkId::Hash> ObjectMapType;
typedef std::hash_set<NetworkId, NetworkId::Hash> DeletedSetType;
typedef std::hash_map<Coordinates, Node*, Coordinates::Hasher> NodeMapType;
typedef std::tr1::unordered_map<NetworkId, PlanetProxyObject*, NetworkId::Hash> ObjectMapType;
typedef std::tr1::unordered_set<NetworkId, NetworkId::Hash> DeletedSetType;
typedef std::tr1::unordered_map<Coordinates, Node*, Coordinates::Hasher> NodeMapType;
private:
std::string m_sceneId;