Mercurial > malikania

changeset 119:1359e09fb3c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc: many FreeBSD fixes
author David Demelier <markand@malikania.fr>
date Fri, 22 Sep 2017 10:40:20 +0200
parents 841e39c8aba4
children 0043c240e95b
files libserver-test/malikania/server/db/test_character.cpp libserver-test/malikania/server/db/test_spell.cpp libserver/malikania/server/db/spell.hpp
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libserver-test/malikania/server/db/test_character.cpp	Fri Sep 22 09:32:27 2017 +0200
+++ b/libserver-test/malikania/server/db/test_character.cpp	Fri Sep 22 10:40:20 2017 +0200
@@ -68,7 +68,7 @@
     character_set set;
 
     for (const auto& pair : characters_) {
-        if (pair.second["account_id"] == account_id) {
+        if (pair.second["account_id"].get<int>() == account_id) {
             auto c = std::make_unique<test_character>(
                 pair.second["nickname"],
                 pair.second["classname"],
@@ -86,7 +86,7 @@
 void test_dao::remove_all(std::int64_t account_id)
 {
     for (auto it = characters_.begin(); it != characters_.end(); ) {
-        if (it->second["account_id"] == account_id) {
+        if (it->second["account_id"].get<int>() == account_id) {
             db_.test_character_dao().remove_all(it->second["id"]);
             it = characters_.erase(it);
         } else
--- a/libserver-test/malikania/server/db/test_spell.cpp	Fri Sep 22 09:32:27 2017 +0200
+++ b/libserver-test/malikania/server/db/test_spell.cpp	Fri Sep 22 10:40:20 2017 +0200
@@ -48,7 +48,7 @@
     spell_set set;
 
     for (const auto& pair : spells_) {
-        if (pair.second["character_id"] == character_id) {
+        if (pair.second["character_id"].get<int>() == character_id) {
             auto s = std::make_unique<test_spell>(pair.second["classname"], db_);
 
             s->unserialize(pair.second);
@@ -62,7 +62,7 @@
 void test_dao::remove_all(std::int64_t character_id)
 {
     for (auto it = spells_.begin(); it != spells_.end(); ) {
-        if (it->second["character_id"] == character_id)
+        if (it->second["character_id"].get<int>() == character_id)
             it = spells_.erase(it);
         else
             it++;
--- a/libserver/malikania/server/db/spell.hpp	Fri Sep 22 09:32:27 2017 +0200
+++ b/libserver/malikania/server/db/spell.hpp	Fri Sep 22 10:40:20 2017 +0200
@@ -25,6 +25,7 @@
  */
 
 #include <memory>
+#include <string>
 #include <unordered_set>
 
 #include "model.hpp"