From 1cc5fee5904832da6564f12c858423fd5bd1b2b6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 22 Apr 2014 17:14:28 -0700 Subject: Make travis happy --- src/map/chrif.cpp | 2 +- src/map/clif.cpp | 2 +- src/map/clif.t.hpp | 2 +- src/map/grfio.hpp | 2 +- src/map/magic-expr-eval.hpp | 2 +- src/map/magic-expr.hpp | 2 +- src/map/magic-interpreter-aux.hpp | 2 +- src/map/magic-interpreter-base.hpp | 2 +- src/map/magic-interpreter.t.hpp | 2 +- src/map/magic-stmt.hpp | 2 +- src/map/magic-v2.hpp | 2 +- src/map/map.t.hpp | 2 +- src/map/mapflag.hpp | 2 +- src/map/mob.t.hpp | 2 +- src/map/path.hpp | 2 +- src/map/pc.t.hpp | 2 +- src/map/skill-pools.hpp | 2 +- src/map/skill.t.hpp | 2 +- src/map/tmw.hpp | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/map') diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index 88fb039..3c2ac63 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -1210,7 +1210,7 @@ void check_connect_char_server(TimerData *, tick_t) PRINTF("Attempt to connect to char-server...\n"_fmt); chrif_state = 0; char_session = make_connection(char_ip, char_port, - SessionParsers{func_parse: chrif_parse, func_delete: chrif_delete}); + SessionParsers{.func_parse= chrif_parse, .func_delete= chrif_delete}); if (!char_session) return; realloc_fifo(char_session, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); diff --git a/src/map/clif.cpp b/src/map/clif.cpp index be544db..bdb8609 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -5482,5 +5482,5 @@ void clif_parse(Session *s) void do_init_clif(void) { - make_listen_port(map_port, SessionParsers{func_parse: clif_parse, func_delete: clif_delete}); + make_listen_port(map_port, SessionParsers{.func_parse= clif_parse, .func_delete= clif_delete}); } diff --git a/src/map/clif.t.hpp b/src/map/clif.t.hpp index 5cb06ad..2da6cde 100644 --- a/src/map/clif.t.hpp +++ b/src/map/clif.t.hpp @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include diff --git a/src/map/grfio.hpp b/src/map/grfio.hpp index 9b6d5e2..3083f8c 100644 --- a/src/map/grfio.hpp +++ b/src/map/grfio.hpp @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include diff --git a/src/map/magic-expr-eval.hpp b/src/map/magic-expr-eval.hpp index 9b9f5f8..e19c896 100644 --- a/src/map/magic-expr-eval.hpp +++ b/src/map/magic-expr-eval.hpp @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "../range/slice.hpp" diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp index 4d78bab..bbe8bbf 100644 --- a/src/map/magic-expr.hpp +++ b/src/map/magic-expr.hpp @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "magic-interpreter.hpp" diff --git a/src/map/magic-interpreter-aux.hpp b/src/map/magic-interpreter-aux.hpp index 1369b38..0b78b58 100644 --- a/src/map/magic-interpreter-aux.hpp +++ b/src/map/magic-interpreter-aux.hpp @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "magic-interpreter.t.hpp" diff --git a/src/map/magic-interpreter-base.hpp b/src/map/magic-interpreter-base.hpp index 9b1e08a..780ada4 100644 --- a/src/map/magic-interpreter-base.hpp +++ b/src/map/magic-interpreter-base.hpp @@ -19,6 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" #endif // TMWA_MAP_MAGIC_INTERPRETER_BASE_HPP diff --git a/src/map/magic-interpreter.t.hpp b/src/map/magic-interpreter.t.hpp index 9310a7b..1fe5fa3 100644 --- a/src/map/magic-interpreter.t.hpp +++ b/src/map/magic-interpreter.t.hpp @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "../generic/enum.hpp" diff --git a/src/map/magic-stmt.hpp b/src/map/magic-stmt.hpp index 838854f..0e687a6 100644 --- a/src/map/magic-stmt.hpp +++ b/src/map/magic-stmt.hpp @@ -19,6 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" #endif // TMWA_MAP_MAGIC_STMT_HPP diff --git a/src/map/magic-v2.hpp b/src/map/magic-v2.hpp index 888e183..92b6f4e 100644 --- a/src/map/magic-v2.hpp +++ b/src/map/magic-v2.hpp @@ -19,7 +19,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "../strings/zstring.hpp" diff --git a/src/map/map.t.hpp b/src/map/map.t.hpp index d9e3c1f..d90bdab 100644 --- a/src/map/map.t.hpp +++ b/src/map/map.t.hpp @@ -586,7 +586,7 @@ struct NpcName : VString<23> {}; struct ScriptLabel : VString<23> {}; struct ItemName : VString<23> {}; -class BlockId : public Wrapped { public: BlockId() : Wrapped() {} protected: template constexpr explicit BlockId(A... a) : Wrapped(a...) {} }; +class BlockId : public Wrapped { public: BlockId() : Wrapped() {} protected: constexpr explicit BlockId(uint32_t a) : Wrapped(a) {} }; inline BlockId account_to_block(AccountId a) { return wrap(unwrap(a)); } inline diff --git a/src/map/mapflag.hpp b/src/map/mapflag.hpp index e3a55f5..c8eec1d 100644 --- a/src/map/mapflag.hpp +++ b/src/map/mapflag.hpp @@ -19,7 +19,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "../mmo/extract.hpp" // TODO remove this (requires specializing the *other* half) diff --git a/src/map/mob.t.hpp b/src/map/mob.t.hpp index 37fd13e..5e056d5 100644 --- a/src/map/mob.t.hpp +++ b/src/map/mob.t.hpp @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include diff --git a/src/map/path.hpp b/src/map/path.hpp index 47b9814..9bdb520 100644 --- a/src/map/path.hpp +++ b/src/map/path.hpp @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "map.hpp" diff --git a/src/map/pc.t.hpp b/src/map/pc.t.hpp index 65e1046..e022f3b 100644 --- a/src/map/pc.t.hpp +++ b/src/map/pc.t.hpp @@ -22,7 +22,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include diff --git a/src/map/skill-pools.hpp b/src/map/skill-pools.hpp index 6781907..28351b1 100644 --- a/src/map/skill-pools.hpp +++ b/src/map/skill-pools.hpp @@ -19,6 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" #endif // TMWA_MAP_SKILL_POOLS_HPP diff --git a/src/map/skill.t.hpp b/src/map/skill.t.hpp index 4e30cba..b2ef2de 100644 --- a/src/map/skill.t.hpp +++ b/src/map/skill.t.hpp @@ -21,7 +21,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include diff --git a/src/map/tmw.hpp b/src/map/tmw.hpp index 670599e..9b11d64 100644 --- a/src/map/tmw.hpp +++ b/src/map/tmw.hpp @@ -20,7 +20,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" # include "../strings/fwd.hpp" -- cgit v1.2.3-70-g09d2