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 
--HG--
branch : develop
This commit is contained in:
kaetemi 2015-02-23 12:25:23 +01:00
parent 543331ea75
commit a912fa49ac
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/server/src/pd_lib/db_description_parser.cpp
View file

@ -260,7 +260,7 @@ bool CDBDescriptionParser::loadType(xmlNodePtr node)
return false; return false;
} }
typeNode.EnumValues.push_back(make_pair<string, uint32>(name, value)); typeNode.EnumValues.push_back(std::pair<string, uint32>(name, value));
if (typeNode.Dimension <= value) if (typeNode.Dimension <= value)
typeNode.Dimension = value; typeNode.Dimension = value;

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

@ -571,7 +571,7 @@ void CPDSLib::update()
CMessage* msgupd = new CMessage("PD_UPDATE"); CMessage* msgupd = new CMessage("PD_UPDATE");
msgupd->serial(_DatabaseId); msgupd->serial(_DatabaseId);
msgupd->serial(_UpdateId); msgupd->serial(_UpdateId);
_QueuedMessages.push_back(make_pair<uint32,CMessage*>(_UpdateId, msgupd)); _QueuedMessages.push_back(std::pair<uint32, CMessage*>(_UpdateId, msgupd));
++_UpdateId; ++_UpdateId;
// serial queue // serial queue

6
code/ryzom/server/src/pd_lib/pd_messages.cpp
View file

@ -504,7 +504,7 @@ bool CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
if (message.getType() == CDbMessage::PushContext) if (message.getType() == CDbMessage::PushContext)
{ {
contextsStart.push_back(std::make_pair<uint, bool>(msg, false)); contextsStart.push_back(std::pair<uint, bool>(msg, false));
} }
else if (message.getType() == CDbMessage::PopContext) else if (message.getType() == CDbMessage::PopContext)
{ {
@ -561,7 +561,7 @@ bool CUpdateLog::selectMessages(const CDBDescriptionParser& description, const s
if (message.getType() == CDbMessage::PushContext) if (message.getType() == CDbMessage::PushContext)
{ {
contextsStart.push_back(std::make_pair<uint, bool>(msg, false)); contextsStart.push_back(std::pair<uint, bool>(msg, false));
} }
else if (message.getType() == CDbMessage::PopContext) else if (message.getType() == CDbMessage::PopContext)
{ {
@ -644,7 +644,7 @@ bool CUpdateLog::selectMessages(const CDBDescriptionParser& description, const N
if (message.getType() == CDbMessage::PushContext) if (message.getType() == CDbMessage::PushContext)
{ {
contextsStart.push_back(std::make_pair<uint, bool>(msg, false)); contextsStart.push_back(std::pair<uint, bool>(msg, false));
} }
else if (message.getType() == CDbMessage::PopContext) else if (message.getType() == CDbMessage::PopContext)
{ {

2
code/ryzom/server/src/pd_lib/pd_string_mapper.cpp
View file

@ -64,7 +64,7 @@ void CPDStringMapper::setMapping(const std::string& str, uint32 id)
return; return;
} }
its = _StringMap.insert(std::make_pair<std::string, uint32>(lowMapStr, id)).first; its = _StringMap.insert(std::pair<std::string, uint32>(lowMapStr, id)).first;
_IdMap[id] = its; _IdMap[id] = its;
} }

10
code/ryzom/server/src/pd_lib/pd_utils.h
View file

@ -494,9 +494,13 @@ struct CColumnIndexHashMapTraits
static const size_t min_buckets = 8; static const size_t min_buckets = 8;
CColumnIndexHashMapTraits() { } CColumnIndexHashMapTraits() { }
size_t operator() (const CColumnIndex &id) const size_t operator() (const CColumnIndex &id) const
{ {
return id.hash(); return id.hash();
} }
bool operator()(const CColumnIndex &left, const CColumnIndex &right)
{
return left.hash() < right.hash();
}
}; };
class CSetMap class CSetMap