Updated with two proton fixes that enable Clang to compile cleanly git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/branches/fadams-javascript-binding@1622877 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a8566983 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a8566983 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a8566983 Branch: refs/heads/master Commit: a8566983a073c64311fad2369c89125c1f97b5c5 Parents: 1c2f489 Author: fadams <fadams@unknown> Authored: Sat Sep 6 15:49:04 2014 +0000 Committer: fadams <fadams@unknown> Committed: Sat Sep 6 15:49:04 2014 +0000 ---------------------------------------------------------------------- proton-c/src/codec/codec.c | 2 +- proton-c/src/codec/decoder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8566983/proton-c/src/codec/codec.c ---------------------------------------------------------------------- diff --git a/proton-c/src/codec/codec.c b/proton-c/src/codec/codec.c index 0660032..87d7df7 100644 --- a/proton-c/src/codec/codec.c +++ b/proton-c/src/codec/codec.c @@ -141,7 +141,7 @@ int pni_inspect_atom(pn_atom_t *atom, pn_string_t *str) case PN_INT: return pn_string_addf(str, "%" PRIi32, atom->u.as_int); case PN_CHAR: - return pn_string_addf(str, "%lc", atom->u.as_char); + return pn_string_addf(str, "%c", atom->u.as_char); case PN_ULONG: return pn_string_addf(str, "%" PRIu64, atom->u.as_ulong); case PN_LONG: http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a8566983/proton-c/src/codec/decoder.c ---------------------------------------------------------------------- diff --git a/proton-c/src/codec/decoder.c b/proton-c/src/codec/decoder.c index 28e8ae1..7a01388 100644 --- a/proton-c/src/codec/decoder.c +++ b/proton-c/src/codec/decoder.c @@ -395,7 +395,7 @@ int pn_decoder_decode_value(pn_decoder_t *decoder, pn_data_t *data, uint8_t code int e = pn_decoder_decode_type(decoder, data, &acode); if (e) return e; pn_type_t type = pn_code2type(acode); - if (type < 0) return type; + if ((int)type < 0) return (int)type; for (size_t i = 0; i < count; i++) { e = pn_decoder_decode_value(decoder, data, acode); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
