From 380bc1de6fe3f8ff5ad576938edc946e7125ed70 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 24 Mar 2014 21:33:36 -0700 Subject: Hopefully fix the build --- src/char/char.hpp | 2 +- src/char/int_party.hpp | 2 +- src/char/int_storage.hpp | 2 +- src/char/inter.hpp | 2 +- src/io/cxxstdio.hpp | 4 ++-- src/map/itemdb.cpp | 6 ------ src/map/itemdb.hpp | 3 ++- src/map/magic-v2.cpp | 2 +- src/spell-convert/ast.hpp | 12 ++++++------ 9 files changed, 15 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/char/char.hpp b/src/char/char.hpp index 6c47c1a..377b1c6 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -8,7 +8,7 @@ # include "../mmo/ip.hpp" # include "../mmo/mmo.hpp" -class Session; +struct Session; constexpr int MAX_MAP_SERVERS = 30; diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index 73020a9..9fe68fa 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -3,7 +3,7 @@ # include "../strings/fwd.hpp" -class Session; +struct Session; void inter_party_init(void); int inter_party_save(void); diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index 356d924..c6cd084 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -3,7 +3,7 @@ # include "../strings/fwd.hpp" -class Session; +struct Session; void inter_storage_init(void); int inter_storage_save(void); diff --git a/src/char/inter.hpp b/src/char/inter.hpp index 6dd907d..06c99f6 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -3,7 +3,7 @@ # include "../strings/fwd.hpp" -class Session; +struct Session; bool inter_config(XString key, ZString value); void inter_init2(); diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp index 0324ebc..9edeebb 100644 --- a/src/io/cxxstdio.hpp +++ b/src/io/cxxstdio.hpp @@ -60,7 +60,7 @@ namespace cxxstdio template inline __attribute__((format(printf, 2, 3))) - int do_print(T&& t, const char *fmt, ...) throw() + int do_print(T&& t, const char *fmt, ...) { int rv; va_list ap; @@ -72,7 +72,7 @@ namespace cxxstdio template inline __attribute__((format(scanf, 2, 3))) - int do_scan(T&& t, const char *fmt, ...) throw() + int do_scan(T&& t, const char *fmt, ...) { int rv; va_list ap; diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 1822b8a..b1a1a30 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -21,12 +21,6 @@ #include "../poison.hpp" -constexpr int MAX_RANDITEM = 2000; - -// ** ITEMDB_OVERRIDE_NAME_VERBOSE ** -// 定義すると、itemdb.txtとgrfで名前が異なる場合、表示します. -//#define ITEMDB_OVERRIDE_NAME_VERBOSE 1 - static Map item_db; diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 624030e..ab06189 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -33,7 +33,8 @@ struct random_item_data int per; }; -struct item_data *itemdb_searchname(ItemName name) = delete; +inline +struct item_data *itemdb_searchname(ItemName) = delete; struct item_data *itemdb_searchname(XString name); struct item_data *itemdb_search(int nameid); struct item_data *itemdb_exists(int nameid); diff --git a/src/map/magic-v2.cpp b/src/map/magic-v2.cpp index b10df3f..9fb5001 100644 --- a/src/map/magic-v2.cpp +++ b/src/map/magic-v2.cpp @@ -411,7 +411,7 @@ namespace magic_v2 case sexpr::TOKEN: { ZString dirs[8] = { - "S", "SW", "W", "NW", "N", "NE", "E", "SE", + ZString("S"), ZString("SW"), ZString("W"), ZString("NW"), ZString("N"), ZString("NE"), ZString("E"), ZString("SE"), }; auto begin = std::begin(dirs); auto end = std::end(dirs); diff --git a/src/spell-convert/ast.hpp b/src/spell-convert/ast.hpp index a830463..afb280a 100644 --- a/src/spell-convert/ast.hpp +++ b/src/spell-convert/ast.hpp @@ -6,9 +6,9 @@ # include "../strings/rstring.hpp" -#if __GNUC__ == 4 && __GNUC_MINOR__ == 6 -#define override -#endif +# if __GNUC__ == 4 && __GNUC_MINOR__ == 6 +# define override +# endif // We just leak # pragma GCC diagnostic ignored "-Wnon-virtual-dtor" @@ -438,8 +438,8 @@ struct AreaBar : Expression virtual void show() override; }; -#ifdef override -#undef override -#endif +# ifdef override +# undef override +# endif #endif // AST_HPP -- cgit v1.2.3-70-g09d2