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

Fixed: Compilation with VC++ 2013

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2018-07-31 18:36:36 +02:00
parent d4fbb64120
commit 1000e29a96
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/pacs/build_rbank/build_surf.cpp
View file

@ -671,7 +671,7 @@ bool NLPACS::CComputableSurface::checkConsistency()
CComputableSurfaceBorder& border = (*BorderKeeper)[BorderIds[i]]; CComputableSurfaceBorder& border = (*BorderKeeper)[BorderIds[i]];
for (j=0; j+1<border.Vertices.size(); ++j) for (j=0; j+1<border.Vertices.size(); ++j)
edges.push_back(std::make_pair<NLMISC::CVectorD, NLMISC::CVectorD>(border.Vertices[j], border.Vertices[j+1])); edges.push_back(std::make_pair(border.Vertices[j], border.Vertices[j+1]));
} }
for (i=0; i+1<edges.size(); ++i) for (i=0; i+1<edges.size(); ++i)

2
code/ryzom/server/src/ags_test/command_event_manager.h
View file

@ -70,7 +70,7 @@ public:
/// Set the value of a var /// Set the value of a var
const std::string &set(const std::string &var, const std::string &value) const std::string &set(const std::string &var, const std::string &value)
{ {
std::pair<TVarMap::iterator, bool> res = _Map.insert(std::make_pair<std::string, std::string>(var, value)); std::pair<TVarMap::iterator, bool> res = _Map.insert(std::make_pair(var, value));
if (!res.second) if (!res.second)
(*(res.first)).second = value; (*(res.first)).second = value;
return (*(res.first)).second; return (*(res.first)).second;

2
code/ryzom/server/src/ags_test/move_manager.h
View file

@ -95,7 +95,7 @@ public:
{ {
if (PrimZoneMap.find(primZone.getName()) == PrimZoneMap.end()) if (PrimZoneMap.find(primZone.getName()) == PrimZoneMap.end())
{ {
PrimZoneMap.insert(std::make_pair<std::string, NLLIGO::CPrimZone>(primZone.getName(), primZone)); PrimZoneMap.insert(std::make_pair(primZone.getName(), primZone));
nlinfo("Using PrimZone '%s'", primZone.getName().c_str()); nlinfo("Using PrimZone '%s'", primZone.getName().c_str());
} }
else else

2
code/ryzom/server/src/entity_view_service/entity_view_service.h
View file

@ -179,7 +179,7 @@ public:
{ {
nlinfo("Create entity %s", id.toString().c_str()); nlinfo("Create entity %s", id.toString().c_str());
std::pair<TEntityMap::iterator,bool> res = _Entities.insert(std::make_pair<NLMISC::CEntityId,CEntity>(id, CEntity())); std::pair<TEntityMap::iterator,bool> res = _Entities.insert(std::make_pair(id, CEntity()));
TEntityMap::iterator ite = res.first; TEntityMap::iterator ite = res.first;
nlassert(ite != _Entities.end() && res.second); nlassert(ite != _Entities.end() && res.second);

4
code/ryzom/tools/pd_parser/parser.cpp
View file

@ -4512,11 +4512,11 @@ void CDeclarationNode::generateSetContent(CCallContext *context)
if (useReference) if (useReference)
{ {
FetchId.add(Type+"*\t"+objectVariable+" = static_cast<"+Type+"*>("+pdslibFunc("create")+"(tableIndex));"); FetchId.add(Type+"*\t"+objectVariable+" = static_cast<"+Type+"*>("+pdslibFunc("create")+"(tableIndex));");
FetchId.add(cppName()+".insert(std::make_pair<"+keyType->getName()+","+Type+"*>("+keyVariable+", "+objectVariable+"));"); FetchId.add(cppName()+".insert(std::make_pair("+keyVariable+", "+objectVariable+"));");
} }
else else
{ {
FetchId.add(cppName()+".insert(std::make_pair<"+keyType->getName()+","+Type+">("+keyVariable+", "+Type+"()));"); FetchId.add(cppName()+".insert(std::make_pair("+keyVariable+", "+Type+"()));");
FetchId.add(Type+"*\t"+objectVariable+" = &("+cppName()+"["+keyVariable+"]);"); FetchId.add(Type+"*\t"+objectVariable+" = &("+cppName()+"["+keyVariable+"]);");
} }
FetchId.add(pdslibFunc("setRowIndex")+"(rowIndex, "+objectVariable+");"); FetchId.add(pdslibFunc("setRowIndex")+"(rowIndex, "+objectVariable+");");

2
code/ryzom/tools/pd_parser/parser_rules.h
View file

@ -161,7 +161,7 @@ CParseNode *parse##nodename(CTokenizer &tokenizer) \
PARSE_FAIL \ PARSE_FAIL \
CTokenizer::CToken t2 = tokenizer.currentToken(); \ CTokenizer::CToken t2 = tokenizer.currentToken(); \
tokenizer.next(); \ tokenizer.next(); \
main->savein.push_back(std::make_pair<std::string, std::string>(tokenizer.get(t1), tokenizer.get(t2))); \ main->savein.push_back(std::make_pair(tokenizer.get(t1), tokenizer.get(t2))); \
} }
/* /*