Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags

Now builds/runs using c++11
This commit is contained in:
Anonymous
2014-01-23 08:55:46 -07:00
parent fabe85739d
commit e6431a9fd4
14 changed files with 34 additions and 49 deletions
@@ -543,8 +543,8 @@ void AiDebugString::addCircleAtObjectOffset(NetworkId const & target, Vector con
// Object-space circle relative to the target
if (radius > 0.0f)
{
m_circleList->push_back(std::make_pair(target, std::make_pair(Circle(position_o, radius), color)));
{
m_circleList->push_back(std::make_pair(CachedNetworkId(target), std::make_pair(Circle(position_o, radius), color)));
}
else
{
@@ -100,7 +100,7 @@ void AppearanceManager::install()
crcStringVector = new CrcStringVector();
crcStringVector->reserve(static_cast<size_t>(numberOfColumns));
ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair(new PersistentCrcString(crcSourceName), crcStringVector));
ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair((const CrcString*)new PersistentCrcString(crcSourceName), crcStringVector));
}
}