susumu.yata
null+****@clear*****
Tue Aug 11 14:02:23 JST 2015
susumu.yata 2015-08-11 14:02:23 +0900 (Tue, 11 Aug 2015) New Revision: 3161712e53c0c2d1d1606bb1aedfbeb724a98744 https://github.com/groonga/groonga/commit/3161712e53c0c2d1d1606bb1aedfbeb724a98744 Message: ts: rename a switching macro from GRN_WITH_EGN to GRN_WITH_TS GitHub: #372 Modified files: lib/proc.c lib/ts.cpp Modified: lib/proc.c (+4 -4) =================================================================== --- lib/proc.c 2015-08-11 13:30:37 +0900 (ee31646) +++ lib/proc.c 2015-08-11 14:02:23 +0900 (e82f709) @@ -26,9 +26,9 @@ #include "grn_token_cursor.h" #include "grn_expr.h" -#ifdef GRN_WITH_EGN +#ifdef GRN_WITH_TS # include "grn_ts.h" -#endif /* GRN_WITH_EGN */ +#endif /* GRN_WITH_TS */ #include <string.h> #include <stdlib.h> @@ -1011,7 +1011,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, } if ((table_ = grn_ctx_get(ctx, table, table_len))) { // match_columns_ = grn_obj_column(ctx, table_, match_columns, match_columns_len); -#ifdef GRN_WITH_EGN +#ifdef GRN_WITH_TS if (filter_len && (filter[0] == '?') && (ctx->impl->output_type == GRN_CONTENT_JSON)) { ctx->rc = grn_egn_select(ctx, table_, filter + 1, filter_len - 1, @@ -1023,7 +1023,7 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, } goto exit; } -#endif /* GRN_WITH_EGN */ +#endif /* GRN_WITH_TS */ if (query_len || filter_len) { grn_obj *v; GRN_EXPR_CREATE_FOR_QUERY(ctx, table_, cond, v); Modified: lib/ts.cpp (+2 -2) =================================================================== --- lib/ts.cpp 2015-08-11 13:30:37 +0900 (51f2981) +++ lib/ts.cpp 2015-08-11 14:02:23 +0900 (e13693c) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef GRN_WITH_EGN +#ifdef GRN_WITH_TS #include "grn_ts.hpp" @@ -3452,4 +3452,4 @@ grn_egn_select(grn_ctx *ctx, grn_obj *table, } #endif -#endif // GRN_WITH_EGN +#endif // GRN_WITH_TS -------------- next part -------------- HTML����������������������������...Download