mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 20:27:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

puzzles: Fix warnings seen with clang 6.0

Browse Source 
(From OE-Core rev: dc5b66d664495a284e77531c06ab981842d45c2e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-02-08 08:55:14 -08:00
committed by Richard Purdie
parent 95a59ddf94
commit e6ae22abf1
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
meta/recipes-sato/puzzles/files/0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch Normal file
View File

@@ -0,0 +1,47 @@
From 7b2949c48a178861f6568a18c8f45e841e36f89e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 7 Feb 2018 23:57:12 -0800
Subject: [PATCH] signpost: Add paranthesis to remove doubt about precendence
Clang complains e.g.
error: logical not is only applied to the left hand side of
this bitwise operator [-Werror,-Wlogical-not-parentheses]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
signpost.c | 2 +-
tracks.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/signpost.c b/signpost.c
index aa2e13a..2e2dff2 100644
--- a/signpost.c
+++ b/signpost.c
@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable)
int i, ret = 1;
assert(copy->n == orig->n);
for (i = 0; i < copy->n; i++) {
- if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue;
+ if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue;
assert(copy->nums[i] >= 0);
assert(copy->nums[i] <= copy->n);
if (copy->nums[i] != orig->nums[i]) {
diff --git a/tracks.c b/tracks.c
index 5b27350..ca44ce1 100644
--- a/tracks.c
+++ b/tracks.c
@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n,
x = i%w;
y = i/w;
if (abs(ox-x) > 1 || abs(oy-y) > 1) {
- if (!state->sflags[i] & S_TRACK)
+ if (!(state->sflags[i] & S_TRACK))
did += solve_set_sflag(state, x, y, S_NOTRACK, what);
}
}
--
2.16.1

1
meta/recipes-sato/puzzles/puzzles_git.bb
View File

@@ -14,6 +14,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://0001-Use-labs-instead-of-abs.patch \
file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
file://0001-signpost-Add-paranthesis-to-remove-doubt-about-prece.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3"