Fixed some compiler warnings.

This commit is contained in:
WrinklyNinja
2013-10-20 11:33:32 +01:00
parent 99c14074c8
commit 0e748d6274
4 changed files with 26 additions and 10 deletions
+23 -7
View File
@@ -677,7 +677,9 @@ namespace YAML {
for (typename std::set<T, Compare>::const_iterator it=rhs.begin(), endIt=rhs.end(); it != endIt; ++it) {
out << *it;
}
out << EndSeq;
out << EndSeq;
return out;
}
inline Emitter& operator << (Emitter& out, const boss::PluginDirtyInfo& rhs) {
@@ -692,7 +694,9 @@ namespace YAML {
if (rhs.DeletedNavmeshes() > 0)
out << Key << "nav" << Value << rhs.DeletedNavmeshes();
out << EndMap;
out << EndMap;
return out;
}
inline Emitter& operator << (Emitter& out, const boss::Game& rhs) {
@@ -713,7 +717,9 @@ namespace YAML {
else if (rhs.Id() == boss::g_game_fonv)
out << Key << Value << boss::Game(boss::g_game_fonv).FolderName();
out << EndMap;
out << EndMap;
return out;
}
inline Emitter& operator << (Emitter& out, const boss::MessageContent& rhs) {
@@ -723,7 +729,9 @@ namespace YAML {
out << Key << "str" << Value << rhs.Str();
out << EndMap;
out << EndMap;
return out;
}
inline Emitter& operator << (Emitter& out, const boss::Message& rhs) {
@@ -744,7 +752,9 @@ namespace YAML {
if (!rhs.Condition().empty())
out << Key << "condition" << Value << rhs.Condition();
out << EndMap;
out << EndMap;
return out;
}
inline Emitter& operator << (Emitter& out, const boss::File& rhs) {
@@ -762,6 +772,8 @@ namespace YAML {
out << EndMap;
}
return out;
}
inline Emitter& operator << (Emitter& out, const boss::Tag& rhs) {
@@ -779,7 +791,9 @@ namespace YAML {
out << Key << "condition" << Value << rhs.Condition()
<< EndMap;
}
}
return out;
}
inline Emitter& operator << (Emitter& out, const boss::Plugin& rhs) {
@@ -813,7 +827,9 @@ namespace YAML {
out << Key << "dirty" << Value << rhs.DirtyInfo();
out << EndMap;
}
}
return out;
}
}
+1 -1
View File
@@ -211,7 +211,7 @@ namespace boss {
boost::filesystem::path GetLocalAppDataPath() {
#if _WIN32 || _WIN64
HWND owner;
HWND owner = 0;
TCHAR path[MAX_PATH];
BOOST_LOG_TRIVIAL(trace) << "Getting path to %LOCALAPPDATA%.";
+1 -1
View File
@@ -416,7 +416,7 @@ namespace boss {
which is supported by the v3 syntax. */
int bracketNo = 0;
size_t pos;
size_t pos = 0;
while ((pos = condition.find(" and ", pos)) != std::string::npos) {
+1 -1
View File
@@ -61,7 +61,7 @@
#define BOOST_THREAD_VERSION 4
IMPLEMENT_APP(BossGUI);
wxIMPLEMENT_APP(BossGUI);
using namespace boss;
using namespace std;