swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-30 00:15:47 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/PlanetObject.cpp
+3 -3
View File
@@ -108,20 +108,20 @@ namespace PlanetObjectNamespace
if(index == std::string::npos)
{
parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(eventString, 0));
parsedVector.push_back(std::make_pair(eventString, 0));
return;
}
while(index != std::string::npos)
{
std::string subString = eventString.substr(offset, (index - offset));
parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(subString, index));
parsedVector.push_back(std::make_pair(subString, index));
offset = index + 1;
index = eventString.find(delimiter, offset);
}
std::string subString = eventString.substr(offset, eventString.size());
parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(subString, index));
parsedVector.push_back(std::make_pair(subString, index));
}
const char * makeCopyOfString(const char * rhs)