From: Petteri Aimonen <jpa@github.mail.kapsi.fi>
Date: Tue, 22 Sep 2015 04:24:21 +0000 (+0300)
Subject: Merge pull request #171 from kylemanna/misc
X-Git-Tag: 5.0.2~186^2~115
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6db720aa7597d1830016ad3f697ddade65d481bf;hp=aa316910644779259894ba57b528260eb9da1cb5;p=apps%2Fagl-service-can-low-level.git

Merge pull request #171 from kylemanna/misc

decode: Fix compiler issue with gcc-5
---

diff --git a/pb_decode.c b/pb_decode.c
index b21bfe37..5cdcbcfb 100644
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -886,7 +886,8 @@ bool checkreturn pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[
         if (PB_HTYPE(iter.pos->type) == PB_HTYPE_REQUIRED
             && iter.required_field_index < PB_MAX_REQUIRED_FIELDS)
         {
-            fields_seen[iter.required_field_index >> 3] |= (uint8_t)(1 << (iter.required_field_index & 7));
+            uint8_t tmp = (uint8_t)(1 << (iter.required_field_index & 7));
+            fields_seen[iter.required_field_index >> 3] |= tmp;
         }
             
         if (!decode_field(stream, wire_type, &iter))