Kouhei Sutou
null+****@clear*****
Mon Mar 30 21:30:10 JST 2015
Kouhei Sutou 2015-03-30 21:30:10 +0900 (Mon, 30 Mar 2015) New Revision: 2be326f538015b7a4c38cb3bfbe299ada6627a5d https://github.com/groonga/groonga/commit/2be326f538015b7a4c38cb3bfbe299ada6627a5d Message: suggest: use MSGPACK_OBJECT_FLOAT Modified files: lib/grn_msgpack.h src/suggest/groonga_suggest_httpd.c Modified: lib/grn_msgpack.h (+10 -0) =================================================================== --- lib/grn_msgpack.h 2015-03-30 21:26:50 +0900 (793276e) +++ lib/grn_msgpack.h 2015-03-30 21:30:10 +0900 (c2c4719) @@ -20,18 +20,28 @@ #ifdef GRN_WITH_MESSAGE_PACK # include <msgpack.h> + # if MSGPACK_VERSION_MAJOR < 1 typedef unsigned int msgpack_size_t; + # define msgpack_pack_str(packer, size) msgpack_pack_raw(packer, size) # define msgpack_pack_str_body(packer, value, size) \ msgpack_pack_raw_body(packer, value, size) + # define MSGPACK_OBJECT_STR MSGPACK_OBJECT_RAW +# define MSGPACK_OBJECT_FLOAT MSGPACK_OBJECT_DOUBLE + # define MSGPACK_STR_PTR(object) (object)->via.raw.ptr # define MSGPACK_STR_SIZE(object) (object)->via.raw.size + +# define MSGPACK_FLOAT(object) (object)->via.dec # else /* MSGPACK_VERSION_MAJOR < 1 */ typedef size_t msgpack_size_t; + # define MSGPACK_STR_PTR(object) (object)->via.str.ptr # define MSGPACK_STR_SIZE(object) (object)->via.str.size + +# define MSGPACK_FLOAT(object) (object)->via.f64 # endif /* MSGPACK_VERSION_MAJOR < 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ Modified: src/suggest/groonga_suggest_httpd.c (+2 -2) =================================================================== --- src/suggest/groonga_suggest_httpd.c 2015-03-30 21:26:50 +0900 (a00af53) +++ src/suggest/groonga_suggest_httpd.c 2015-03-30 21:30:10 +0900 (f5c3aa5) @@ -433,8 +433,8 @@ msgpack2json(msgpack_object *o, grn_ctx *ctx, grn_obj *buf) } GRN_TEXT_PUTC(ctx, buf, ']'); break; - case MSGPACK_OBJECT_DOUBLE: - grn_text_ftoa(ctx, buf, o->via.dec); + case MSGPACK_OBJECT_FLOAT: + grn_text_ftoa(ctx, buf, MSGPACK_FLOAT(o)); break; default: print_error("cannot handle this msgpack type."); -------------- next part -------------- HTML����������������������������...Download