Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Visual Studio 2013 compilation support for Ryzom Server

Browse source
This commit is contained in:
kaetemi 2015-02-23 13:08:03 +01:00
parent cdbb9bd21a
commit ec09096b63
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/server/src/frontend_service/client_entity_id_translator.h
View file

@ -92,7 +92,8 @@ private:
struct CHash struct CHash
{ {
enum { bucket_size = 4, min_buckets = 8, }; enum { bucket_size = 4, min_buckets = 8, };
size_t operator () ( const TEntityIndex& index ) const { return index.getIndex(); } size_t operator () (const TEntityIndex& index) const { return index.getIndex(); }
bool operator() (const TEntityIndex& left, const TEntityIndex& right) { return left < right; }
}; };
// table to map CEntityId to TCLEntityId // table to map CEntityId to TCLEntityId

3
code/ryzom/server/src/frontend_service/client_id_lookup.h
View file

@ -117,7 +117,8 @@ private:
struct CIdHash struct CIdHash
{ {
enum { bucket_size = 4, min_buckets = 8, }; enum { bucket_size = 4, min_buckets = 8, };
size_t operator () ( NLMISC::CEntityId id ) const { return (uint32)id.getShortId(); } size_t operator () (NLMISC::CEntityId id) const { return (uint32)id.getShortId(); }
bool operator() (const NLMISC::CEntityId& left, const NLMISC::CEntityId& right) { return left < right; }
}; };
typedef CHashMap<NLMISC::CEntityId, TClientId, CIdHash> TIdToClientMap; typedef CHashMap<NLMISC::CEntityId, TClientId, CIdHash> TIdToClientMap;

1
code/ryzom/server/src/frontend_service/fe_types.h
View file

@ -77,6 +77,7 @@ struct CInetAddressHashMapTraits
//return x.port(); //return x.port();
return x.internalIPAddress(); return x.internalIPAddress();
} }
bool operator() (const NLNET::CInetAddress& left, const NLNET::CInetAddress& right) { return left < right; }
// bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const // bool operator() (const NLNET::CInetAddress &x1, const NLNET::CInetAddress &x2) const
// { // {
// return classId1 < classId2; // return classId1 < classId2;

2
code/ryzom/server/src/frontend_service/frontend_service.cpp
View file

@ -1862,7 +1862,7 @@ NLMISC_COMMAND( dumpImpulseStats, "Dump Impulse stat to XML log", "<logfile> [[-
if (reverse) if (reverse)
comp = -comp; comp = -comp;
result.push_back(std::make_pair<float, CClientHost*>(comp, client)); result.push_back(std::pair<float, CClientHost*>(comp, client));
} }
if (ucriterion != 0 && !result.empty()) if (ucriterion != 0 && !result.empty())

3
code/ryzom/server/src/gpm_service/world_position_manager.h
View file

@ -140,7 +140,8 @@ public:
struct CEntityIdHash struct CEntityIdHash
{ {
enum { bucket_size = 4, min_buckets = 8, }; enum { bucket_size = 4, min_buckets = 8, };
size_t operator () ( const NLMISC::CEntityId &id ) const { return (uint32)id.getShortId(); } size_t operator () (const NLMISC::CEntityId &id) const { return (uint32)id.getShortId(); }
size_t operator () (const NLMISC::CEntityId &left, const NLMISC::CEntityId &right) const { return left < right; }
}; };
/// Container of entities (all entities are referenced by this container /// Container of entities (all entities are referenced by this container