0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Xcode warnings

Browse source
This commit is contained in:
mattsc 2022-06-22 18:28:42 -07:00
parent be8783154e
commit 6786b26b2a
6 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj
View file

@ -6429,7 +6429,9 @@
460F21CA2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CODE_SIGN_ENTITLEMENTS = Resources/Wesnoth.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
@ -6466,6 +6468,7 @@
460F21CB2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
COPY_PHASE_STRIP = YES;
@ -6483,6 +6486,7 @@
460F21CC2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
@ -6505,6 +6509,7 @@
460F21CD2858F72100EE2131 /* SignedRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
@ -6581,6 +6586,7 @@
91C548CC1D8866ED00FE6A7B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
@ -6598,6 +6604,7 @@
91C548CD1D8866ED00FE6A7B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
@ -6613,6 +6620,7 @@
B597C49A0FACD3CE00CE81F5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
@ -6636,6 +6644,7 @@
B597C49B0FACD3CE00CE81F5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
@ -6658,6 +6667,7 @@
B5BB6B4D0F890FBC00444FBF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
@ -6676,6 +6686,7 @@
B5BB6B4E0F890FBC00444FBF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = YES;
@ -6692,7 +6703,9 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
@ -6729,7 +6742,9 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_FLOAT_CONVERSION = NO;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;

2
src/actions/move.cpp
View file

@ -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() )

2
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -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);

4
src/gui/dialogs/statistics_dialog.cpp
View file

@ -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);

2
src/scripting/lua_kernel_base.cpp
View file

@ -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)) {

4
src/server/common/server_base.cpp
View file

@ -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(); };
}
}