Skip to content

Commit

Permalink
Merge pull request #6793 from mattsc/Xcode_warnings
Browse files Browse the repository at this point in the history 
Fix Xcode warnings
  • Loading branch information
@mattsc
mattsc committed Jun 23, 2022
2 parents 3de9599 + 1945c6a commit 28831fe
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 12 deletions.
162 changes: 157 additions & 5 deletions projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6429,7 +6429,19 @@
460F21CA2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = Resources/Wesnoth.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -6443,12 +6455,24 @@
"HAVE_LIBPNG=1",
"HAVE_HISTORY=1",
);
GCC_WARN_UNUSED_VARIABLE = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Applications;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LLVM_LTO = YES_THIN;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "-Wall";
OTHER_LDFLAGS = (
"-lz",
"-lbz2",
Expand All @@ -6459,30 +6483,56 @@
PRODUCT_NAME = "The Battle for Wesnoth";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = NO;
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
};
name = SignedRelease;
};
460F21CB2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = N5CYW96P9T;
GCC_PREPROCESSOR_DEFINITIONS = (
"LOCALEDIR=\\\"translations\\\"",
"FIFODIR=\\\"/var/run/wesnothd\\\"",
);
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
INSTALL_PATH = /usr/local/bin;
OTHER_CFLAGS = "-Wall";
PRODUCT_BUNDLE_IDENTIFIER = org.wesnoth.wesnothd;
PRODUCT_NAME = wesnothd;
WARNING_CFLAGS = "";
};
name = SignedRelease;
};
460F21CC2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
Expand All @@ -6505,6 +6555,7 @@
460F21CD2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -6581,6 +6632,7 @@
91C548CC1D8866ED00FE6A7B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
Expand All @@ -6598,6 +6650,7 @@
91C548CD1D8866ED00FE6A7B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
Expand All @@ -6613,6 +6666,7 @@
B597C49A0FACD3CE00CE81F5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
Expand All @@ -6636,6 +6690,7 @@
B597C49B0FACD3CE00CE81F5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
Expand All @@ -6658,7 +6713,19 @@
B5BB6B4D0F890FBC00444FBF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -6667,7 +6734,18 @@
"LOCALEDIR=\\\"translations\\\"",
"FIFODIR=\\\"/var/run/wesnothd\\\"",
);
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
INSTALL_PATH = /usr/local/bin;
OTHER_CFLAGS = "-Wall";
PRODUCT_BUNDLE_IDENTIFIER = org.wesnoth.wesnothd;
PRODUCT_NAME = wesnothd;
};
Expand All @@ -6676,23 +6754,59 @@
B5BB6B4E0F890FBC00444FBF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"LOCALEDIR=\\\"translations\\\"",
"FIFODIR=\\\"/var/run/wesnothd\\\"",
);
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
INSTALL_PATH = /usr/local/bin;
OTHER_CFLAGS = "-Wall";
PRODUCT_BUNDLE_IDENTIFIER = org.wesnoth.wesnothd;
PRODUCT_NAME = wesnothd;
WARNING_CFLAGS = "";
};
name = Release;
};
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -6708,10 +6822,23 @@
"HAVE_HISTORY=1",
"LOAD_REVISION=1",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Applications;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "-Wall";
OTHER_LDFLAGS = (
"-lz",
"-lbz2",
Expand All @@ -6729,7 +6856,19 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -6742,12 +6881,24 @@
"HAVE_LIBPNG=1",
"HAVE_HISTORY=1",
);
GCC_WARN_UNUSED_VARIABLE = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Applications;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LLVM_LTO = YES_THIN;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "-Wall";
OTHER_LDFLAGS = (
"-lz",
"-lbz2",
Expand All @@ -6758,6 +6909,7 @@
PRODUCT_NAME = "The Battle for Wesnoth";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = NO;
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion src/actions/move.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ namespace { // Private helpers for move_unit()
, real_end_(begin_)
// Unit information:
, move_it_(resources::gameboard->units().find(*begin_))
, orig_side_(( assert(move_it_ != resources::gameboard->units().end()), move_it_->side() ))
, orig_side_(( static_cast<void>(assert(move_it_ != resources::gameboard->units().end())), move_it_->side() ))
, orig_moves_(move_it_->movement_left())
, orig_dir_(move_it_->facing())
, goto_( is_ai_move() ? move_it_->get_goto() : route.back() )
Expand Down
2 changes: 1 addition & 1 deletion src/gui/dialogs/multiplayer/mp_create_game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ void mp_create_game::pre_show(window& win)
#define UPDATE_ATTRIBUTE(field, convert) \
do { if(cfg.has_attribute(#field)) { field##_->set_widget_value(cfg[#field].convert()); } } while(false) \

plugins_context_->set_callback("update_settings", [this, &win](const config& cfg) {
plugins_context_->set_callback("update_settings", [this](const config& cfg) {
UPDATE_ATTRIBUTE(turns, to_int);
UPDATE_ATTRIBUTE(gold, to_int);
UPDATE_ATTRIBUTE(support, to_int);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dialogs/statistics_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ void statistics_dialog::add_damage_row(
item["label"] = type;
data.emplace("damage_type", item);

const int shift = statistics::stats::decimal_shift;
static const int shift = statistics::stats::decimal_shift;

const auto damage_str = [shift](long long damage, long long expected) {
const auto damage_str = [](long long damage, long long expected) {
const long long shifted = ((expected * 20) + shift) / (2 * shift);
std::ostringstream str;
write_actual_and_expected(str, damage, static_cast<double>(shifted) * 0.1);
Expand Down
2 changes: 1 addition & 1 deletion src/scripting/lua_kernel_base.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static int impl_get_dir_suffix(lua_State*L)
* This function does the actual work of grabbing all the attribute names.
* It's a separate function so that it can be used by tab-completion as well.
*/
std::vector<std::string> luaW_get_attributes(lua_State* L, int idx)
static std::vector<std::string> luaW_get_attributes(lua_State* L, int idx)
{
std::vector<std::string> keys;
if(lua_istable(L, idx)) {
Expand Down
4 changes: 2 additions & 2 deletions src/server/common/server_base.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,11 @@ template<class SocketPtr> void server_base::send_doc_queued(SocketPtr socket, st
return;
}

ON_SCOPE_EXIT(this, socket) { queues.erase(socket); };
ON_SCOPE_EXIT(socket) { queues.erase(socket); };

while(queues[socket].size() > 0) {
coro_send_doc(socket, *(queues[socket].front()), yield);
ON_SCOPE_EXIT(this, socket) { queues[socket].pop(); };
ON_SCOPE_EXIT(socket) { queues[socket].pop(); };
}
}

Expand Down

0 comments on commit 28831fe

Please sign in to comment.