Kouhei Sutou
null+****@clear*****
Tue Jan 12 11:24:56 JST 2016
Kouhei Sutou 2016-01-12 11:24:56 +0900 (Tue, 12 Jan 2016) New Revision: 7c488fff7a68ed10ca1cec70733d784c5caeb749 https://github.com/groonga/groonga/commit/7c488fff7a68ed10ca1cec70733d784c5caeb749 Message: Use "#pragma once" instead of include guard Because "#pragma once" is sufficiency portable. https://en.wikipedia.org/wiki/Pragma_once#Portability says the following compiler supports "#pragma once": * Clang * Comeau C/C++ * C++Builder XE3 * Digital Mars C++ * GCC * HP C/aC++ * IBM XL C/C++ * Intel C++ Compiler * Microsoft Visual C++ * Pelles C * ARM DS-5 * IAR C/C++ "Solaris Studio C/C++" doesn't support "#pragma once" but we don't support "Solaris Studio C/C++". Modified files: include/groonga.h include/groonga/command.h include/groonga/conf.h include/groonga/expr.h include/groonga/file_reader.h include/groonga/geo.h include/groonga/groonga.h include/groonga/ii.h include/groonga/nfkc.h include/groonga/normalizer.h include/groonga/obj.h include/groonga/output.h include/groonga/plugin.h include/groonga/portability.h include/groonga/request_canceler.h include/groonga/scorer.h include/groonga/thread.h include/groonga/token.h include/groonga/token_filter.h include/groonga/tokenizer.h include/groonga/util.h include/groonga/windows.h include/groonga/windows_event_logger.h lib/dat/array.hpp lib/dat/base.hpp lib/dat/block.hpp lib/dat/check.hpp lib/dat/cursor-factory.hpp lib/dat/cursor.hpp lib/dat/dat.hpp lib/dat/entry.hpp lib/dat/file-impl.hpp lib/dat/file.hpp lib/dat/header.hpp lib/dat/id-cursor.hpp lib/dat/key-cursor.hpp lib/dat/key.hpp lib/dat/node.hpp lib/dat/predictive-cursor.hpp lib/dat/prefix-cursor.hpp lib/dat/string.hpp lib/dat/trie.hpp lib/dat/vector.hpp lib/grn.h lib/grn_com.h lib/grn_ctx.h lib/grn_ctx_impl.h lib/grn_ctx_impl_mrb.h lib/grn_dat.h lib/grn_db.h lib/grn_error.h lib/grn_expr.h lib/grn_expr_code.h lib/grn_geo.h lib/grn_hash.h lib/grn_ii.h lib/grn_index_column.h lib/grn_io.h lib/grn_logger.h lib/grn_mrb.h lib/grn_msgpack.h lib/grn_normalizer.h lib/grn_output.h lib/grn_pat.h lib/grn_plugin.h lib/grn_proc.h lib/grn_report.h lib/grn_request_canceler.h lib/grn_rset.h lib/grn_scanner.h lib/grn_scorer.h lib/grn_scorers.h lib/grn_snip.h lib/grn_store.h lib/grn_str.h lib/grn_string.h lib/grn_token_cursor.h lib/grn_tokenizers.h lib/grn_ts.h lib/grn_util.h lib/mrb/mrb_accessor.h lib/mrb/mrb_array.h lib/mrb/mrb_bulk.h lib/mrb/mrb_cache.h lib/mrb/mrb_column.h lib/mrb/mrb_command.h lib/mrb/mrb_command_input.h lib/mrb/mrb_command_version.h lib/mrb/mrb_conf.h lib/mrb/mrb_content_type.h lib/mrb/mrb_converter.h lib/mrb/mrb_ctx.h lib/mrb/mrb_database.h lib/mrb/mrb_double_array_trie.h lib/mrb/mrb_error.h lib/mrb/mrb_expr.h lib/mrb/mrb_fixed_size_column.h lib/mrb/mrb_hash_table.h lib/mrb/mrb_id.h lib/mrb/mrb_index_column.h lib/mrb/mrb_index_cursor.h lib/mrb/mrb_logger.h lib/mrb/mrb_object.h lib/mrb/mrb_object_flags.h lib/mrb/mrb_operator.h lib/mrb/mrb_options.h lib/mrb/mrb_patricia_trie.h lib/mrb/mrb_procedure.h lib/mrb/mrb_query_logger.h lib/mrb/mrb_record.h lib/mrb/mrb_table.h lib/mrb/mrb_table_cursor.h lib/mrb/mrb_table_cursor_flags.h lib/mrb/mrb_table_group_flags.h lib/mrb/mrb_table_group_result.h lib/mrb/mrb_table_sort_flags.h lib/mrb/mrb_table_sort_key.h lib/mrb/mrb_type.h lib/mrb/mrb_variable_size_column.h lib/mrb/mrb_void.h lib/mrb/mrb_writer.h lib/ts/ts_buf.h lib/ts/ts_cursor.h lib/ts/ts_expr.h lib/ts/ts_expr_builder.h lib/ts/ts_expr_node.h lib/ts/ts_expr_parser.h lib/ts/ts_log.h lib/ts/ts_op.h lib/ts/ts_plan.h lib/ts/ts_sorter.h lib/ts/ts_str.h lib/ts/ts_types.h lib/ts/ts_util.h Modified: include/groonga.h (+3 -5) =================================================================== --- include/groonga.h 2016-01-12 10:37:22 +0900 (a9cceb10) +++ include/groonga.h 2016-01-12 11:24:56 +0900 (74b0c38) @@ -1,5 +1,5 @@ /* - Copyright(C) 2014-2015 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_H -#define GROONGA_H + +#pragma once #include "groonga/portability.h" #include "groonga/groonga.h" @@ -32,5 +32,3 @@ #include "groonga/windows.h" #include "groonga/windows_event_logger.h" #include "groonga/file_reader.h" - -#endif /* GROONGA_H */ Modified: include/groonga/command.h (+3 -5) =================================================================== --- include/groonga/command.h 2016-01-12 10:37:22 +0900 (ac5270e) +++ include/groonga/command.h 2016-01-12 11:24:56 +0900 (6e08809) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_COMMAND_H -#define GROONGA_COMMAND_H + +#pragma once #include <groonga/plugin.h> @@ -77,5 +77,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_command_run(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_COMMAND_H */ Modified: include/groonga/conf.h (+2 -5) =================================================================== --- include/groonga/conf.h 2016-01-12 10:37:22 +0900 (9fc556c) +++ include/groonga/conf.h 2016-01-12 11:24:56 +0900 (d9e975c) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_CONF_H -#define GRN_CONF_H +#pragma once #ifdef __cplusplus extern "C" { @@ -38,5 +37,3 @@ GRN_API grn_rc grn_conf_get(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_CONF_H */ Modified: include/groonga/expr.h (+3 -5) =================================================================== --- include/groonga/expr.h 2016-01-12 10:37:22 +0900 (c4668f2) +++ include/groonga/expr.h 2016-01-12 11:24:56 +0900 (9e209d2) @@ -1,5 +1,5 @@ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_EXPR_H -#define GROONGA_EXPR_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -107,5 +107,3 @@ GRN_API unsigned int grn_expr_estimate_size(grn_ctx *ctx, grn_obj *expr); #ifdef __cplusplus } #endif - -#endif /* GROONGA_EXPR_H */ Modified: include/groonga/file_reader.h (+2 -5) =================================================================== --- include/groonga/file_reader.h 2016-01-12 10:37:22 +0900 (8cf178b) +++ include/groonga/file_reader.h 2016-01-12 11:24:56 +0900 (7432407) @@ -1,5 +1,5 @@ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_FILE_READER_H -#define GROONGA_FILE_READER_H +#pragma once #ifdef __cplusplus extern "C" { @@ -36,5 +35,3 @@ GRN_API grn_rc grn_file_reader_read_line(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GROONGA_FILE_READER_H */ Modified: include/groonga/geo.h (+2 -5) =================================================================== --- include/groonga/geo.h 2016-01-12 10:37:22 +0900 (b7a954b) +++ include/groonga/geo.h 2016-01-12 11:24:56 +0900 (30fbb8d) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_GEO_H -#define GROONGA_GEO_H +#pragma once #ifdef __cplusplus extern "C" { @@ -35,5 +34,3 @@ GRN_API int grn_geo_table_sort(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GROONGA_GEO_H */ Modified: include/groonga/groonga.h (+3 -5) =================================================================== --- include/groonga/groonga.h 2016-01-12 10:37:22 +0900 (6f2aa20) +++ include/groonga/groonga.h 2016-01-12 11:24:56 +0900 (0cd780a) @@ -1,5 +1,5 @@ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_GROONGA_H -#define GROONGA_GROONGA_H + +#pragma once #include <stdarg.h> #include <sys/types.h> @@ -2044,5 +2044,3 @@ GRN_API grn_rc grn_dat_cursor_delete(grn_ctx *ctx, grn_dat_cursor *c, #ifdef __cplusplus } #endif - -#endif /* GROONGA_GROONGA_H */ Modified: include/groonga/ii.h (+3 -5) =================================================================== --- include/groonga/ii.h 2016-01-12 10:37:22 +0900 (f399398) +++ include/groonga/ii.h 2016-01-12 11:24:56 +0900 (0ab1510) @@ -1,5 +1,5 @@ /* - Copyright(C) 2009-2014 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_II_H -#define GROONGA_II_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -57,5 +57,3 @@ GRN_API grn_rc grn_ii_cursor_close(grn_ctx *ctx, grn_ii_cursor *c); #ifdef __cplusplus } #endif - -#endif /* GROONGA_II_H */ Modified: include/groonga/nfkc.h (+4 -5) =================================================================== --- include/groonga/nfkc.h 2016-01-12 10:37:22 +0900 (f4e628d) +++ include/groonga/nfkc.h 2016-01-12 11:24:56 +0900 (c13f6ae) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_NFKC_H -#define GROONGA_NFKC_H + +#pragma once #include <groonga.h> @@ -28,5 +29,3 @@ GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *str); #ifdef __cplusplus } #endif - -#endif /* GROONGA_NFKC_H */ Modified: include/groonga/normalizer.h (+3 -5) =================================================================== --- include/groonga/normalizer.h 2016-01-12 10:37:22 +0900 (3ec843c) +++ include/groonga/normalizer.h 2016-01-12 11:24:56 +0900 (8276892) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2012 Brazil + Copyright(C) 2012-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_NORMALIER_H -#define GROONGA_NORMALIER_H + +#pragma once #include <stddef.h> @@ -51,5 +51,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_normalizer_register(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_NORMALIER_H */ Modified: include/groonga/obj.h (+3 -5) =================================================================== --- include/groonga/obj.h 2016-01-12 10:37:22 +0900 (e8ac280) +++ include/groonga/obj.h 2016-01-12 11:24:56 +0900 (619c825) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_OBJ_H -#define GROONGA_OBJ_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -54,5 +54,3 @@ GRN_API grn_rc grn_obj_reindex(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif - -#endif /* GROONGA_OBJ_H */ Modified: include/groonga/output.h (+3 -5) =================================================================== --- include/groonga/output.h 2016-01-12 10:37:22 +0900 (27908d9) +++ include/groonga/output.h 2016-01-12 11:24:56 +0900 (4a62666) @@ -1,5 +1,5 @@ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_OUTPUT_H -#define GROONGA_OUTPUT_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -106,5 +106,3 @@ GRN_API grn_rc grn_text_otoj(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj, #ifdef __cplusplus } #endif - -#endif /* GROONGA_OUTPUT_H */ Modified: include/groonga/plugin.h (+3 -5) =================================================================== --- include/groonga/plugin.h 2016-01-12 10:37:22 +0900 (3671c08) +++ include/groonga/plugin.h 2016-01-12 11:24:56 +0900 (394eecf) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2010-2014 Brazil + Copyright(C) 2010-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_PLUGIN_H -#define GROONGA_PLUGIN_H + +#pragma once #include <stddef.h> @@ -172,5 +172,3 @@ GRN_API grn_obj *grn_plugin_command_create(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GROONGA_PLUGIN_H */ Modified: include/groonga/portability.h (+3 -5) =================================================================== --- include/groonga/portability.h 2016-01-12 10:37:22 +0900 (3fad4bd) +++ include/groonga/portability.h 2016-01-12 11:24:56 +0900 (a25f87a) @@ -1,5 +1,5 @@ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_PORTABILITY_H -#define GROONGA_PORTABILITY_H + +#pragma once #ifdef WIN32 # ifdef __cplusplus @@ -170,5 +170,3 @@ #else /* WIN32 */ # define grn_close(fd) close((fd)) #endif /* WIN32 */ - -#endif /* GROONGA_PORTABILITY_H */ Modified: include/groonga/request_canceler.h (+2 -5) =================================================================== --- include/groonga/request_canceler.h 2016-01-12 10:37:22 +0900 (0032a77) +++ include/groonga/request_canceler.h 2016-01-12 11:24:56 +0900 (b1fb5c9) @@ -1,5 +1,5 @@ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_REQUEST_CANCELER_H -#define GROONGA_REQUEST_CANCELER_H +#pragma once #ifdef __cplusplus extern "C" { @@ -35,5 +34,3 @@ GRN_API grn_bool grn_request_canceler_cancel(const char *request_id, #ifdef __cplusplus } #endif - -#endif /* GROONGA_REQUEST_CANCELER_H */ Modified: include/groonga/scorer.h (+3 -5) =================================================================== --- include/groonga/scorer.h 2016-01-12 10:37:22 +0900 (6f9c589) +++ include/groonga/scorer.h 2016-01-12 11:24:56 +0900 (6247afd) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_SCORER_H -#define GROONGA_SCORER_H + +#pragma once #include <groonga/plugin.h> @@ -91,5 +91,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_scorer_register(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_SCORER_H */ Modified: include/groonga/thread.h (+2 -5) =================================================================== --- include/groonga/thread.h 2016-01-12 10:37:22 +0900 (011111f) +++ include/groonga/thread.h 2016-01-12 11:24:56 +0900 (c7c8f80) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_THREAD_H -#define GROONGA_THREAD_H +#pragma once #ifdef __cplusplus extern "C" { @@ -38,5 +37,3 @@ GRN_API void grn_thread_set_set_limit_func(grn_thread_set_limit_func func, #ifdef __cplusplus } #endif - -#endif /* GROONGA_THREAD_H */ Modified: include/groonga/token.h (+3 -5) =================================================================== --- include/groonga/token.h 2016-01-12 10:37:22 +0900 (5aeaf0b) +++ include/groonga/token.h 2016-01-12 11:24:56 +0900 (20f9fe2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_TOKEN_H -#define GROONGA_TOKEN_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -132,5 +132,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_token_set_status(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKEN_H */ Modified: include/groonga/token_filter.h (+3 -5) =================================================================== --- include/groonga/token_filter.h 2016-01-12 10:37:22 +0900 (9c5a356) +++ include/groonga/token_filter.h 2016-01-12 11:24:56 +0900 (6b09add) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_TOKEN_FILTER_H -#define GROONGA_TOKEN_FILTER_H + +#pragma once #include <groonga/tokenizer.h> @@ -65,5 +65,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_token_filter_register(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKEN_FILTER_H */ Modified: include/groonga/tokenizer.h (+3 -5) =================================================================== --- include/groonga/tokenizer.h 2016-01-12 10:37:22 +0900 (8ad7f67) +++ include/groonga/tokenizer.h 2016-01-12 11:24:56 +0900 (bdb1c41) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2012 Brazil + Copyright(C) 2012-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_TOKENIZER_H -#define GROONGA_TOKENIZER_H + +#pragma once #include <groonga/plugin.h> #include <groonga/token.h> @@ -258,5 +258,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_tokenizer_register(grn_ctx *ctx, const char *plugin #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKENIZER_H */ Modified: include/groonga/util.h (+3 -5) =================================================================== --- include/groonga/util.h 2016-01-12 10:37:22 +0900 (446cb88) +++ include/groonga/util.h 2016-01-12 11:24:56 +0900 (52997ea) @@ -1,5 +1,5 @@ /* - Copyright(C) 2010-2014 Brazil + Copyright(C) 2010-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_UTIL_H -#define GROONGA_UTIL_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -36,5 +36,3 @@ GRN_API void grn_p_ii_values(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif - -#endif /* GROONGA_UTIL_H */ Modified: include/groonga/windows.h (+2 -5) =================================================================== --- include/groonga/windows.h 2016-01-12 10:37:22 +0900 (290b276) +++ include/groonga/windows.h 2016-01-12 11:24:56 +0900 (1984a77) @@ -1,5 +1,5 @@ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_WINDOWS_H -#define GROONGA_WINDOWS_H +#pragma once #ifdef __cplusplus extern "C" { @@ -30,5 +29,3 @@ GRN_API const char *grn_windows_base_dir(void); #ifdef __cplusplus } #endif - -#endif /* GROONGA_WINDOWS_H */ Modified: include/groonga/windows_event_logger.h (+2 -5) =================================================================== --- include/groonga/windows_event_logger.h 2016-01-12 10:37:22 +0900 (c5fd80a) +++ include/groonga/windows_event_logger.h 2016-01-12 11:24:56 +0900 (7fe6ea8) @@ -1,5 +1,5 @@ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GROONGA_WINDOWS_EVENT_LOGGER_H -#define GROONGA_WINDOWS_EVENT_LOGGER_H +#pragma once #ifdef __cplusplus extern "C" { @@ -29,5 +28,3 @@ GRN_API grn_rc grn_windows_event_logger_set(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GROONGA_WINDOWS_EVENT_LOGGER_H */ Modified: lib/dat/array.hpp (+3 -5) =================================================================== --- lib/dat/array.hpp 2016-01-12 10:37:22 +0900 (5536552) +++ lib/dat/array.hpp 2016-01-12 11:24:56 +0900 (ba297e8) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ARRAY_HPP_ -#define GRN_DAT_ARRAY_HPP_ +#pragma once #include "dat.hpp" @@ -96,5 +96,3 @@ class GRN_DAT_API Array { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ARRAY_HPP_ Modified: lib/dat/base.hpp (+3 -5) =================================================================== --- lib/dat/base.hpp 2016-01-12 10:37:22 +0900 (577e69e) +++ lib/dat/base.hpp 2016-01-12 11:24:56 +0900 (6f80d7c) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_BASE_HPP_ -#define GRN_DAT_BASE_HPP_ +#pragma once #include "dat.hpp" @@ -65,5 +65,3 @@ class GRN_DAT_API Base { } // namespace dat } // namespace grn - -#endif // GRN_DAT_BASE_HPP_ Modified: lib/dat/block.hpp (+3 -5) =================================================================== --- lib/dat/block.hpp 2016-01-12 10:37:22 +0900 (4675083) +++ lib/dat/block.hpp 2016-01-12 11:24:56 +0900 (4f1e78b) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_BLOCK_HPP_ -#define GRN_DAT_BLOCK_HPP_ +#pragma once #include "dat.hpp" @@ -92,5 +92,3 @@ class GRN_DAT_API Block { } // namespace dat } // namespace grn - -#endif // GRN_DAT_BLOCK_HPP_ Modified: lib/dat/check.hpp (+3 -5) =================================================================== --- lib/dat/check.hpp 2016-01-12 10:37:22 +0900 (f7e5787) +++ lib/dat/check.hpp 2016-01-12 11:24:56 +0900 (27abbc9) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CHECK_HPP_ -#define GRN_DAT_CHECK_HPP_ +#pragma once #include "dat.hpp" @@ -147,5 +147,3 @@ class GRN_DAT_API Check { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CHECK_HPP_ Modified: lib/dat/cursor-factory.hpp (+3 -5) =================================================================== --- lib/dat/cursor-factory.hpp 2016-01-12 10:37:22 +0900 (c79ac4e) +++ lib/dat/cursor-factory.hpp 2016-01-12 11:24:56 +0900 (48a0ac5) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CURSOR_FACTORY_HPP_ -#define GRN_DAT_CURSOR_FACTORY_HPP_ +#pragma once #include "cursor.hpp" @@ -42,5 +42,3 @@ class GRN_DAT_API CursorFactory { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CURSOR_FACTORY_HPP_ Modified: lib/dat/cursor.hpp (+3 -5) =================================================================== --- lib/dat/cursor.hpp 2016-01-12 10:37:22 +0900 (0a4887e) +++ lib/dat/cursor.hpp 2016-01-12 11:24:56 +0900 (2dfd98f) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CURSOR_HPP_ -#define GRN_DAT_CURSOR_HPP_ +#pragma once #include "key.hpp" @@ -44,5 +44,3 @@ class GRN_DAT_API Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CURSOR_HPP_ Modified: lib/dat/dat.hpp (+3 -5) =================================================================== --- lib/dat/dat.hpp 2016-01-12 10:37:22 +0900 (c941bf2) +++ lib/dat/dat.hpp 2016-01-12 11:24:56 +0900 (f2e78b4) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_COMMON_HPP_ -#define GRN_DAT_COMMON_HPP_ +#pragma once #ifndef _MSC_VER # include <stddef.h> @@ -245,5 +245,3 @@ typedef Error<STATUS_ERROR> StatusError; } // namespace dat } // namespace grn - -#endif // GRN_DAT_COMMON_HPP_ Modified: lib/dat/entry.hpp (+3 -5) =================================================================== --- lib/dat/entry.hpp 2016-01-12 10:37:22 +0900 (0c0b3ad) +++ lib/dat/entry.hpp 2016-01-12 11:24:56 +0900 (47916e2) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ENTRY_HPP_ -#define GRN_DAT_ENTRY_HPP_ +#pragma once #include "dat.hpp" @@ -57,5 +57,3 @@ class GRN_DAT_API Entry { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ENTRY_HPP_ Modified: lib/dat/file-impl.hpp (+3 -5) =================================================================== --- lib/dat/file-impl.hpp 2016-01-12 10:37:22 +0900 (245dbfc) +++ lib/dat/file-impl.hpp 2016-01-12 11:24:56 +0900 (830cf77) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_FILE_IMPL_HPP_ -#define GRN_DAT_FILE_IMPL_HPP_ +#pragma once #ifdef WIN32 # include <windows.h> @@ -71,5 +71,3 @@ class FileImpl { } // namespace dat } // namespace grn - -#endif // GRN_DAT_FILE_IMPL_HPP_ Modified: lib/dat/file.hpp (+3 -5) =================================================================== --- lib/dat/file.hpp 2016-01-12 10:37:22 +0900 (e7dda0e) +++ lib/dat/file.hpp 2016-01-12 11:24:56 +0900 (25d988d) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_FILE_HPP_ -#define GRN_DAT_FILE_HPP_ +#pragma once #include "dat.hpp" @@ -58,5 +58,3 @@ class GRN_DAT_API File { } // namespace dat } // namespace grn - -#endif // GRN_DAT_FILE_HPP_ Modified: lib/dat/header.hpp (+3 -5) =================================================================== --- lib/dat/header.hpp 2016-01-12 10:37:22 +0900 (4f383ac) +++ lib/dat/header.hpp 2016-01-12 11:24:56 +0900 (cf21307) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_HPP_HEADER_HPP_ -#define GRN_DAT_HPP_HEADER_HPP_ +#pragma once #include "dat.hpp" @@ -177,5 +177,3 @@ class GRN_DAT_API Header { } // namespace dat } // namespace grn - -#endif // GRN_DAT_HPP_HEADER_HPP_ Modified: lib/dat/id-cursor.hpp (+3 -5) =================================================================== --- lib/dat/id-cursor.hpp 2016-01-12 10:37:22 +0900 (aabd734) +++ lib/dat/id-cursor.hpp 2016-01-12 11:24:56 +0900 (0e02b22) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ID_CURSOR_HPP_ -#define GRN_DAT_ID_CURSOR_HPP_ +#pragma once #include "cursor.hpp" @@ -81,5 +81,3 @@ class GRN_DAT_API IdCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ID_CURSOR_HPP_ Modified: lib/dat/key-cursor.hpp (+3 -5) =================================================================== --- lib/dat/key-cursor.hpp 2016-01-12 10:37:22 +0900 (adce41c) +++ lib/dat/key-cursor.hpp 2016-01-12 11:24:56 +0900 (fcaa935) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_KEY_CURSOR_HPP_ -#define GRN_DAT_KEY_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -86,5 +86,3 @@ class GRN_DAT_API KeyCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_KEY_CURSOR_HPP_ Modified: lib/dat/key.hpp (+3 -5) =================================================================== --- lib/dat/key.hpp 2016-01-12 10:37:22 +0900 (21ae474) +++ lib/dat/key.hpp 2016-01-12 11:24:56 +0900 (95fb2b4) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_KEY_HPP_ -#define GRN_DAT_KEY_HPP_ +#pragma once #include "string.hpp" @@ -108,5 +108,3 @@ class GRN_DAT_API Key { } // namespace dat } // namespace grn - -#endif // GRN_DAT_KEY_HPP_ Modified: lib/dat/node.hpp (+3 -5) =================================================================== --- lib/dat/node.hpp 2016-01-12 10:37:22 +0900 (45ae508) +++ lib/dat/node.hpp 2016-01-12 11:24:56 +0900 (7f22d67) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_NODE_HPP_ -#define GRN_DAT_NODE_HPP_ +#pragma once // See base.hpp and check.hpp for details. #include "base.hpp" @@ -125,5 +125,3 @@ class GRN_DAT_API Node { } // namespace dat } // namespace grn - -#endif // GRN_DAT_NODE_HPP_ Modified: lib/dat/predictive-cursor.hpp (+3 -5) =================================================================== --- lib/dat/predictive-cursor.hpp 2016-01-12 10:37:22 +0900 (e4041ff) +++ lib/dat/predictive-cursor.hpp 2016-01-12 11:24:56 +0900 (d02b778) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_PREDICTIVE_CURSOR_HPP_ -#define GRN_DAT_PREDICTIVE_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -82,5 +82,3 @@ class GRN_DAT_API PredictiveCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_PREDICTIVE_CURSOR_HPP_ Modified: lib/dat/prefix-cursor.hpp (+3 -5) =================================================================== --- lib/dat/prefix-cursor.hpp 2016-01-12 10:37:22 +0900 (7a84228) +++ lib/dat/prefix-cursor.hpp 2016-01-12 11:24:56 +0900 (9d2a626) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_PREFIX_CURSOR_HPP_ -#define GRN_DAT_PREFIX_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -76,5 +76,3 @@ class GRN_DAT_API PrefixCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_PREFIX_CURSOR_HPP_ Modified: lib/dat/string.hpp (+3 -5) =================================================================== --- lib/dat/string.hpp 2016-01-12 10:37:22 +0900 (ecbb1e7) +++ lib/dat/string.hpp 2016-01-12 11:24:56 +0900 (c6bee86) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_STRING_HPP_ -#define GRN_DAT_STRING_HPP_ +#pragma once #include "dat.hpp" @@ -171,5 +171,3 @@ inline bool operator>=(const String &lhs, const String &rhs) { } // namespace dat } // namespace grn - -#endif // GRN_DAT_STRING_HPP_ Modified: lib/dat/trie.hpp (+3 -5) =================================================================== --- lib/dat/trie.hpp 2016-01-12 10:37:22 +0900 (8a272bb) +++ lib/dat/trie.hpp 2016-01-12 11:24:56 +0900 (d6e5b9c) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_TRIE_HPP_ -#define GRN_DAT_TRIE_HPP_ +#pragma once #include "array.hpp" #include "header.hpp" @@ -283,5 +283,3 @@ class GRN_DAT_API Trie { } // namespace dat } // namespace grn - -#endif // GRN_DAT_TRIE_HPP_ Modified: lib/dat/vector.hpp (+3 -5) =================================================================== --- lib/dat/vector.hpp 2016-01-12 10:37:22 +0900 (4f32c59) +++ lib/dat/vector.hpp 2016-01-12 11:24:56 +0900 (2022033) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_VECTOR_HPP_ -#define GRN_DAT_VECTOR_HPP_ +#pragma once #include "dat.hpp" @@ -189,5 +189,3 @@ class GRN_DAT_API Vector { } // namespace dat } // namespace grn - -#endif // GRN_DAT_VECTOR_HPP_ Modified: lib/grn.h (+3 -5) =================================================================== --- lib/grn.h 2016-01-12 10:37:22 +0900 (621747f) +++ lib/grn.h 2016-01-12 11:24:56 +0900 (c180b08) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_H -#define GRN_H +#pragma once #ifdef HAVE_CONFIG_H # include <config.h> @@ -765,5 +765,3 @@ GRN_API void grn_sleep(uint32_t seconds); GRN_API void grn_nanosleep(uint64_t nanoseconds); #include <groonga.h> - -#endif /* GRN_H */ Modified: lib/grn_com.h (+3 -5) =================================================================== --- lib/grn_com.h 2016-01-12 10:37:22 +0900 (203ed56) +++ lib/grn_com.h 2016-01-12 11:24:56 +0900 (c1451b1) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_COM_H -#define GRN_COM_H +#pragma once #include "grn.h" #include "grn_str.h" @@ -248,5 +248,3 @@ void grn_edge_dispatch(grn_ctx *ctx, grn_edge *edge, grn_obj *msg); #ifdef __cplusplus } #endif - -#endif /* GRN_COM_H */ Modified: lib/grn_ctx.h (+3 -5) =================================================================== --- lib/grn_ctx.h 2016-01-12 10:37:22 +0900 (c45f3c5) +++ lib/grn_ctx.h 2016-01-12 11:24:56 +0900 (8cf9681) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_CTX_H -#define GRN_CTX_H + +#pragma once #include "grn.h" #include "grn_error.h" @@ -614,5 +614,3 @@ grn_rc grn_db_init_builtin_procs(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_H */ Modified: lib/grn_ctx_impl.h (+3 -5) =================================================================== --- lib/grn_ctx_impl.h 2016-01-12 10:37:22 +0900 (6670d18) +++ lib/grn_ctx_impl.h 2016-01-12 11:24:56 +0900 (09df0ca) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_CTX_IMPL_H -#define GRN_CTX_IMPL_H + +#pragma once #ifndef GRN_CTX_H # include "grn_ctx.h" @@ -203,5 +203,3 @@ struct _grn_ctx_impl { #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_IMPL_H */ Modified: lib/grn_ctx_impl_mrb.h (+2 -5) =================================================================== --- lib/grn_ctx_impl_mrb.h 2016-01-12 10:37:22 +0900 (3e46d2e) +++ lib/grn_ctx_impl_mrb.h 2016-01-12 11:24:56 +0900 (004fc6a) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_CTX_IMPL_MRB_H -#define GRN_CTX_IMPL_MRB_H +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -33,5 +32,3 @@ void grn_ctx_impl_mrb_fin(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_IMPL_MRB_H */ Modified: lib/grn_dat.h (+4 -8) =================================================================== --- lib/grn_dat.h 2016-01-12 10:37:22 +0900 (d3c768f) +++ lib/grn_dat.h 2016-01-12 11:24:56 +0900 (2d4ac2a) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,13 +15,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_H -#define GRN_DAT_H -#ifndef GRN_H -# include "grn.h" -#endif /* GRN_H */ +#pragma once +#include "grn.h" #include "grn_db.h" #ifdef __cplusplus @@ -84,5 +82,3 @@ GRN_API grn_rc grn_dat_flush(grn_ctx *ctx, grn_dat *dat); #ifdef __cplusplus } #endif - -#endif /* GRN_DAT_H */ Modified: lib/grn_db.h (+4 -5) =================================================================== --- lib/grn_db.h 2016-01-12 10:37:22 +0900 (b26989a) +++ lib/grn_db.h 2016-01-12 11:24:56 +0900 (6bfa1cc) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DB_H -#define GRN_DB_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -441,5 +442,3 @@ grn_obj *grn_obj_default_set_value_hook(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_DB_H */ Modified: lib/grn_error.h (+3 -7) =================================================================== --- lib/grn_error.h 2016-01-12 10:37:22 +0900 (65a059d) +++ lib/grn_error.h 2016-01-12 11:24:56 +0900 (897ae50) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,12 +15,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_ERROR_H -#define GRN_ERROR_H -#ifndef GRN_H +#pragma once + #include "grn.h" -#endif /* GRN_H */ #ifdef __cplusplus extern "C" { @@ -34,5 +32,3 @@ GRN_API grn_rc grn_windows_error_code_to_rc(int error_code); #ifdef __cplusplus } #endif - -#endif /* GRN_ERROR_H */ Modified: lib/grn_expr.h (+2 -6) =================================================================== --- lib/grn_expr.h 2016-01-12 10:37:22 +0900 (e5f6bb9) +++ lib/grn_expr.h 2016-01-12 11:24:56 +0900 (7a0f3f0) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_EXPR_H -#define GRN_EXPR_H +#pragma once #include "grn_db.h" @@ -81,6 +80,3 @@ grn_obj *grn_expr_alloc_const(grn_ctx *ctx, grn_obj *expr); #ifdef __cplusplus } #endif - -#endif /* GRN_EXPR_H */ - Modified: lib/grn_expr_code.h (+2 -6) =================================================================== --- lib/grn_expr_code.h 2016-01-12 10:37:22 +0900 (a0fd680) +++ lib/grn_expr_code.h 2016-01-12 11:24:56 +0900 (f33c532) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_EXPR_CODE_H -#define GRN_EXPR_CODE_H +#pragma once #include "grn_db.h" @@ -32,6 +31,3 @@ unsigned int grn_expr_code_n_used_codes(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_EXPR_CODE_H */ - Modified: lib/grn_geo.h (+4 -8) =================================================================== --- lib/grn_geo.h 2016-01-12 10:37:22 +0900 (14e8d81) +++ lib/grn_geo.h 2016-01-12 11:24:56 +0900 (884287a) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2011 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,13 +15,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_GEO_H -#define GRN_GEO_H -#ifndef GRN_H -#include "grn.h" -#endif /* GRN_H */ +#pragma once +#include "grn.h" #include "grn_ii.h" #include "grn_db.h" @@ -200,5 +198,3 @@ double grn_geo_distance_ellipsoid_raw_wgs84(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_GEO_H */ Modified: lib/grn_hash.h (+4 -5) =================================================================== --- lib/grn_hash.h 2016-01-12 10:37:22 +0900 (d72ae0f) +++ lib/grn_hash.h 2016-01-12 11:24:56 +0900 (62b725f) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_HASH_H -#define GRN_HASH_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -375,5 +376,3 @@ void grn_hash_check(grn_ctx *ctx, grn_hash *hash); #ifdef __cplusplus } #endif - -#endif /* GRN_HASH_H */ Modified: lib/grn_ii.h (+4 -5) =================================================================== --- lib/grn_ii.h 2016-01-12 10:37:22 +0900 (06edf2b) +++ lib/grn_ii.h 2016-01-12 11:24:56 +0900 (21e3fc7) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_II_H -#define GRN_II_H + +#pragma once /* "ii" is for inverted index */ @@ -170,5 +171,3 @@ grn_rc grn_ii_build(grn_ctx *ctx, grn_ii *ii, uint64_t sparsity); #ifdef __cplusplus } #endif - -#endif /* GRN_II_H */ Modified: lib/grn_index_column.h (+2 -5) =================================================================== --- lib/grn_index_column.h 2016-01-12 10:37:22 +0900 (9b094e1) +++ lib/grn_index_column.h 2016-01-12 11:24:56 +0900 (afaed9c) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_INDEX_COLUMN_H -#define GRN_INDEX_COLUMN_H +#pragma once #include "grn_db.h" @@ -33,5 +32,3 @@ grn_rc grn_index_column_rebuild(grn_ctx *ctx, grn_obj *index_column); #ifdef __cplusplus } #endif - -#endif /* GRN_INDEX_COLUMN_H */ Modified: lib/grn_io.h (+4 -5) =================================================================== --- lib/grn_io.h 2016-01-12 10:37:22 +0900 (6de63bd) +++ lib/grn_io.h 2016-01-12 11:24:56 +0900 (ed162ce) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_IO_H -#define GRN_IO_H + +#pragma once #include "grn.h" #include "grn_error.h" @@ -474,5 +475,3 @@ grn_rc grn_io_flush(grn_ctx *ctx, grn_io *io); #ifdef __cplusplus } #endif - -#endif /* GRN_IO_H */ Modified: lib/grn_logger.h (+3 -5) =================================================================== --- lib/grn_logger.h 2016-01-12 10:37:22 +0900 (95186ca) +++ lib/grn_logger.h 2016-01-12 11:24:56 +0900 (ea0a85f) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_LOGGER_H -#define GRN_LOGGER_H + +#pragma once #include "grn.h" @@ -33,5 +33,3 @@ void grn_query_logger_fin(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_LOGGER_H */ Modified: lib/grn_mrb.h (+2 -5) =================================================================== --- lib/grn_mrb.h 2016-01-12 10:37:22 +0900 (3726cdc) +++ lib/grn_mrb.h 2016-01-12 11:24:56 +0900 (f7bba8c) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_H -#define GRN_MRB_H +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -42,5 +41,3 @@ GRN_API const char *grn_mrb_get_system_ruby_scripts_dir(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_H */ Modified: lib/grn_msgpack.h (+3 -5) =================================================================== --- lib/grn_msgpack.h 2016-01-12 10:37:22 +0900 (db86987) +++ lib/grn_msgpack.h 2016-01-12 11:24:56 +0900 (c153d83) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2009-2015 Brazil + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MSGPACK_H -#define GRN_MSGPACK_H + +#pragma once #ifdef GRN_WITH_MESSAGE_PACK # include <msgpack.h> @@ -44,5 +44,3 @@ typedef size_t msgpack_size_t; # define MSGPACK_OBJECT_FLOAT_VALUE(object) (object)->via.f64 # endif /* MSGPACK_VERSION_MAJOR < 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ - -#endif /* GRN_MSGPACK_H */ Modified: lib/grn_normalizer.h (+3 -5) =================================================================== --- lib/grn_normalizer.h 2016-01-12 10:37:22 +0900 (8c7bfdd) +++ lib/grn_normalizer.h 2016-01-12 11:24:56 +0900 (3afc9bc) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2012 Brazil + Copyright(C) 2012-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_NORMALIZER_H -#define GRN_NORMALIZER_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -40,5 +40,3 @@ grn_rc grn_db_init_builtin_normalizers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_NORMALIZER_H */ Modified: lib/grn_output.h (+4 -5) =================================================================== --- lib/grn_output.h 2016-01-12 10:37:22 +0900 (c616061) +++ lib/grn_output.h 2016-01-12 11:24:56 +0900 (758443a) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2012 Brazil +/* + Copyright(C) 2010-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_OUTPUT_H -#define GRN_OUTPUT_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -102,5 +103,3 @@ grn_rc grn_output_format_set_columns(grn_ctx *ctx, grn_obj_format *format, #ifdef __cplusplus } #endif - -#endif /* GRN_OUTPUT_H */ Modified: lib/grn_pat.h (+4 -5) =================================================================== --- lib/grn_pat.h 2016-01-12 10:37:22 +0900 (b8c7a32) +++ lib/grn_pat.h 2016-01-12 11:24:56 +0900 (6a2a433) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_PAT_H -#define GRN_PAT_H + +#pragma once #include "grn.h" #include "grn_db.h" @@ -109,5 +110,3 @@ void grn_pat_cache_disable(grn_ctx *ctx, grn_pat *pat); #ifdef __cplusplus } #endif - -#endif /* GRN_PAT_H */ Modified: lib/grn_plugin.h (+4 -5) =================================================================== --- lib/grn_plugin.h 2016-01-12 10:37:22 +0900 (22749c6) +++ lib/grn_plugin.h 2016-01-12 11:24:56 +0900 (3e7b952) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2013 Brazil +/* + Copyright(C) 2010-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_PLUGIN_H -#define GRN_PLUGIN_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -59,5 +60,3 @@ void grn_plugin_ensure_registered(grn_ctx *ctx, grn_obj *proc); #ifdef __cplusplus } #endif - -#endif /* GRN_PLUGIN_H */ Modified: lib/grn_proc.h (+4 -5) =================================================================== --- lib/grn_proc.h 2016-01-12 10:37:22 +0900 (b75d110) +++ lib/grn_proc.h 2016-01-12 11:24:56 +0900 (b4ed1b8) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_PROC_H -#define GRN_PROC_H + +#pragma once #include "grn.h" @@ -31,5 +32,3 @@ void grn_db_init_builtin_query(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_PROC_H */ Modified: lib/grn_report.h (+2 -5) =================================================================== --- lib/grn_report.h 2016-01-12 10:37:22 +0900 (43ea862) +++ lib/grn_report.h 2016-01-12 11:24:56 +0900 (4211ec0) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_REPORT_H -#define GRN_REPORT_H +#pragma once #include "grn_ctx.h" @@ -35,5 +34,3 @@ void grn_report_index(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_REPORT_H */ Modified: lib/grn_request_canceler.h (+2 -5) =================================================================== --- lib/grn_request_canceler.h 2016-01-12 10:37:22 +0900 (4c77ea5) +++ lib/grn_request_canceler.h 2016-01-12 11:24:56 +0900 (2126053) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_REQUEST_CANCELER_H -#define GRN_REQUEST_CANCELER_H +#pragma once #include "grn.h" @@ -27,5 +26,3 @@ void grn_request_canceler_fin(void); #ifdef __cplusplus } #endif - -#endif /* GRN_REQUEST_CANCELER_H */ Modified: lib/grn_rset.h (+4 -5) =================================================================== --- lib/grn_rset.h 2016-01-12 10:37:22 +0900 (b92e211) +++ lib/grn_rset.h 2016-01-12 11:24:56 +0900 (6a6a8b8) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2015 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_RSET_H -#define GRN_RSET_H + +#pragma once #include "grn.h" @@ -111,5 +112,3 @@ void grn_rset_recinfo_set_avg(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_RSET_H */ Modified: lib/grn_scanner.h (+2 -5) =================================================================== --- lib/grn_scanner.h 2016-01-12 10:37:22 +0900 (c511f48) +++ lib/grn_scanner.h 2016-01-12 11:24:56 +0900 (617c2b8) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_SCANNER_H -#define GRN_SCANNER_H +#pragma once #include "grn_expr.h" @@ -39,5 +38,3 @@ void grn_scanner_close(grn_ctx *ctx, grn_scanner *scanner); #ifdef __cplusplus } #endif - -#endif /* GRN_SCANNER_H */ Modified: lib/grn_scorer.h (+3 -5) =================================================================== --- lib/grn_scorer.h 2016-01-12 10:37:22 +0900 (05f9821) +++ lib/grn_scorer.h 2016-01-12 11:24:56 +0900 (438fd87) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_SCORER_H -#define GRN_SCORER_H + +#pragma once #include "grn_ctx.h" #include "grn_db.h" @@ -47,5 +47,3 @@ struct _grn_scorer_matched_record { #ifdef __cplusplus } #endif - -#endif /* GRN_SCORER_H */ Modified: lib/grn_scorers.h (+3 -5) =================================================================== --- lib/grn_scorers.h 2016-01-12 10:37:22 +0900 (ed6c18c) +++ lib/grn_scorers.h 2016-01-12 11:24:56 +0900 (4a6f1e2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_SCORERS_H -#define GRN_SCORERS_H + +#pragma once #include "grn_ctx.h" @@ -29,5 +29,3 @@ grn_rc grn_db_init_builtin_scorers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_SCORERS_H */ Modified: lib/grn_snip.h (+4 -11) =================================================================== --- lib/grn_snip.h 2016-01-12 10:37:22 +0900 (7c123e0) +++ lib/grn_snip.h 2016-01-12 11:24:56 +0900 (023a1d1) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2014 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,17 +15,11 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_SNIP_H -#define GRN_SNIP_H -#ifndef GRN_H -#include "grn.h" -#endif /* GRN_H */ +#pragma once -#ifndef GRN_STR_H +#include "grn.h" #include "grn_str.h" -#endif /* GRN_STR_H */ - #include "grn_db.h" #define ASIZE 256U @@ -128,5 +123,3 @@ void grn_bm_tunedbm(grn_ctx *ctx, snip_cond *cond, grn_obj *string, int flags); #ifdef __cplusplus } #endif - -#endif /* GRN_SNIP_H */ Modified: lib/grn_store.h (+4 -5) =================================================================== --- lib/grn_store.h 2016-01-12 10:37:22 +0900 (b1580c7) +++ lib/grn_store.h 2016-01-12 11:24:56 +0900 (a42e811) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_STORE_H -#define GRN_STORE_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -212,5 +213,3 @@ grn_rc grn_vgram_buf_close(grn_vgram_buf *b); #ifdef __cplusplus } #endif - -#endif /* GRN_STORE_H */ Modified: lib/grn_str.h (+4 -5) =================================================================== --- lib/grn_str.h 2016-01-12 10:37:22 +0900 (e6fab61) +++ lib/grn_str.h 2016-01-12 11:24:56 +0900 (d856f2c) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_STR_H -#define GRN_STR_H + +#pragma once #include "grn.h" #include <groonga/nfkc.h> @@ -121,5 +122,3 @@ grn_bool grn_bulk_is_zero(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif - -#endif /* GRN_STR_H */ Modified: lib/grn_string.h (+6 -20) =================================================================== --- lib/grn_string.h 2016-01-12 10:37:22 +0900 (bb5905c) +++ lib/grn_string.h 2016-01-12 11:24:56 +0900 (95454ef) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2012 Brazil + Copyright(C) 2012-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,24 +17,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_STRING_H -#define GRN_STRING_H +#pragma once -#ifndef GRN_H -# include "grn.h" -#endif /* GRN_H */ - -#ifndef GRN_CTX_H -# include "grn_ctx.h" -#endif /* GRN_CTX_H */ - -#ifndef GRN_DB_H -# include "grn_db.h" -#endif /* GRN_DB_H */ - -#ifndef GRN_STR_H -# include "grn_str.h" -#endif /* GRN_STR_H */ +#include "grn.h" +#include "grn_ctx.h" +#include "grn_db.h" +#include "grn_str.h" #ifdef __cplusplus extern "C" { @@ -61,5 +49,3 @@ grn_rc grn_string_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *string); #ifdef __cplusplus } #endif - -#endif /* GRN_STRING_H */ Modified: lib/grn_token_cursor.h (+4 -5) =================================================================== --- lib/grn_token_cursor.h 2016-01-12 10:37:22 +0900 (fec6222) +++ lib/grn_token_cursor.h 2016-01-12 11:24:56 +0900 (cbb4527) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2014 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TOKEN_CURSOR_H -#define GRN_TOKEN_CURSOR_H + +#pragma once #include "grn_ctx.h" #include "grn_db.h" @@ -75,5 +76,3 @@ GRN_API grn_rc grn_token_cursor_close(grn_ctx *ctx, grn_token_cursor *token_curs #ifdef __cplusplus } #endif - -#endif /* GRN_TOKEN_CURSOR_H */ Modified: lib/grn_tokenizers.h (+4 -5) =================================================================== --- lib/grn_tokenizers.h 2016-01-12 10:37:22 +0900 (fb85fb7) +++ lib/grn_tokenizers.h 2016-01-12 11:24:56 +0900 (d52bbbb) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2014 Brazil +/* + Copyright(C) 2009-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TOKENIZERS_H -#define GRN_TOKENIZERS_H + +#pragma once #include "grn_ctx.h" @@ -34,5 +35,3 @@ grn_rc grn_db_init_builtin_tokenizers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_TOKENIZERS_H */ Modified: lib/grn_ts.h (+2 -5) =================================================================== --- lib/grn_ts.h 2016-01-12 10:37:22 +0900 (37d3046) +++ lib/grn_ts.h 2016-01-12 11:24:56 +0900 (d693964) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_H -#define GRN_TS_H +#pragma once #include "grn.h" @@ -47,5 +46,3 @@ grn_rc grn_ts_select(grn_ctx *ctx, grn_obj *table, #ifdef __cplusplus } #endif - -#endif /* GRN_TS_H */ Modified: lib/grn_util.h (+4 -5) =================================================================== --- lib/grn_util.h 2016-01-12 10:37:22 +0900 (752e4d4) +++ lib/grn_util.h 2016-01-12 11:24:56 +0900 (cd7123c) @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2015 Brazil +/* + Copyright(C) 2010-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -14,8 +15,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_UTIL_H -#define GRN_UTIL_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -38,5 +39,3 @@ GRN_API UINT grn_windows_encoding_to_code_page(grn_encoding encoding); #ifdef __cplusplus } #endif - -#endif /* GRN_UTIL_H */ Modified: lib/mrb/mrb_accessor.h (+2 -4) =================================================================== --- lib/mrb/mrb_accessor.h 2016-01-12 10:37:22 +0900 (7b27e63) +++ lib/mrb/mrb_accessor.h 2016-01-12 11:24:56 +0900 (f8aca1e) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_ACCESSOR_H -#define GRN_MRB_ACCESSOR_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -32,4 +31,3 @@ void grn_mrb_accessor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ACCESSOR_H */ Modified: lib/mrb/mrb_array.h (+2 -4) =================================================================== --- lib/mrb/mrb_array.h 2016-01-12 10:37:22 +0900 (0622816) +++ lib/mrb/mrb_array.h 2016-01-12 11:24:56 +0900 (39e8f5f) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_ARRAY_H -#define GRN_MRB_ARRAY_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_array_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ARRAY_H */ Modified: lib/mrb/mrb_bulk.h (+2 -5) =================================================================== --- lib/mrb/mrb_bulk.h 2016-01-12 10:37:22 +0900 (dd1f46f) +++ lib/mrb/mrb_bulk.h 2016-01-12 11:24:56 +0900 (b351a78) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014-2015 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_BULK_H -#define GRN_MRB_BULK_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -40,5 +39,3 @@ grn_bool grn_mrb_bulk_cast(mrb_state *mrb, #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_BULK_H */ Modified: lib/mrb/mrb_cache.h (+2 -4) =================================================================== --- lib/mrb/mrb_cache.h 2016-01-12 10:37:22 +0900 (dc18c6e) +++ lib/mrb/mrb_cache.h 2016-01-12 11:24:56 +0900 (0eb7963) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_CACHE_H -#define GRN_MRB_CACHE_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -32,4 +31,3 @@ void grn_mrb_cache_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_CACHE_H */ Modified: lib/mrb/mrb_column.h (+2 -4) =================================================================== --- lib/mrb/mrb_column.h 2016-01-12 10:37:22 +0900 (abb9991) +++ lib/mrb/mrb_column.h 2016-01-12 11:24:56 +0900 (c692e76) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_COLUMN_H -#define GRN_MRB_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COLUMN_H */ Modified: lib/mrb/mrb_command.h (+2 -4) =================================================================== --- lib/mrb/mrb_command.h 2016-01-12 10:37:22 +0900 (2b899df) +++ lib/mrb/mrb_command.h 2016-01-12 11:24:56 +0900 (6bbe483) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_COMMAND_H -#define GRN_MRB_COMMAND_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ mrb_value grn_mrb_command_instantiate(grn_ctx *ctx, grn_obj *command); } #endif -#endif /* GRN_MRB_COMMAND_H */ Modified: lib/mrb/mrb_command_input.h (+2 -4) =================================================================== --- lib/mrb/mrb_command_input.h 2016-01-12 10:37:22 +0900 (a4eb097) +++ lib/mrb/mrb_command_input.h 2016-01-12 11:24:56 +0900 (074912d) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_COMMAND_INPUT_H -#define GRN_MRB_COMMAND_INPUT_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_command_input_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COMMAND_INPUT_H */ Modified: lib/mrb/mrb_command_version.h (+2 -4) =================================================================== --- lib/mrb/mrb_command_version.h 2016-01-12 10:37:22 +0900 (655eb80) +++ lib/mrb/mrb_command_version.h 2016-01-12 11:24:56 +0900 (556964a) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_COMMAND_VERSION_H -#define GRN_MRB_COMMAND_VERSION_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_command_version_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COMMAND_VERSION_H */ Modified: lib/mrb/mrb_conf.h (+2 -5) =================================================================== --- lib/mrb/mrb_conf.h 2016-01-12 10:37:22 +0900 (3d39bc4) +++ lib/mrb/mrb_conf.h 2016-01-12 11:24:56 +0900 (8e9c2e3) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_CONF_H -#define GRN_MRB_CONF_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_conf_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_CONF_H */ Modified: lib/mrb/mrb_content_type.h (+2 -4) =================================================================== --- lib/mrb/mrb_content_type.h 2016-01-12 10:37:22 +0900 (46103ff) +++ lib/mrb/mrb_content_type.h 2016-01-12 11:24:56 +0900 (ed0b999) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_CONTENT_TYPE_H -#define GRN_MRB_CONTENT_TYPE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_content_type_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_CONTENT_TYPE_H */ Modified: lib/mrb/mrb_converter.h (+2 -5) =================================================================== --- lib/mrb/mrb_converter.h 2016-01-12 10:37:22 +0900 (f528120) +++ lib/mrb/mrb_converter.h 2016-01-12 11:24:56 +0900 (27fe455) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_CONVERTER_H -#define GRN_MRB_CONVERTER_H +#pragma once #include "../grn_ctx.h" @@ -60,5 +59,3 @@ grn_id grn_mrb_value_to_grn_type(mrb_state *mrb, mrb_value value); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_CONVERTER_H */ Modified: lib/mrb/mrb_ctx.h (+2 -4) =================================================================== --- lib/mrb/mrb_ctx.h 2016-01-12 10:37:22 +0900 (aa527bf) +++ lib/mrb/mrb_ctx.h 2016-01-12 11:24:56 +0900 (b941282) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_CTX_H -#define GRN_MRB_CTX_H +#pragma once #include "../grn_ctx.h" @@ -32,4 +31,3 @@ void grn_mrb_ctx_check(mrb_state *mrb); } #endif -#endif /* GRN_MRB_CTX_H */ Modified: lib/mrb/mrb_database.h (+2 -4) =================================================================== --- lib/mrb/mrb_database.h 2016-01-12 10:37:22 +0900 (fd319c5) +++ lib/mrb/mrb_database.h 2016-01-12 11:24:56 +0900 (7601cdd) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_DATABASE_H -#define GRN_MRB_DATABASE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_database_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_DATABASE_H */ Modified: lib/mrb/mrb_double_array_trie.h (+2 -4) =================================================================== --- lib/mrb/mrb_double_array_trie.h 2016-01-12 10:37:22 +0900 (a69a94e) +++ lib/mrb/mrb_double_array_trie.h 2016-01-12 11:24:56 +0900 (a9109a4) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_DOUBLE_ARRAY_TRIE_H -#define GRN_MRB_DOUBLE_ARRAY_TRIE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_double_array_trie_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_DOUBLE_ARRAY_TRIE_H */ Modified: lib/mrb/mrb_error.h (+2 -4) =================================================================== --- lib/mrb/mrb_error.h 2016-01-12 10:37:22 +0900 (c68c58f) +++ lib/mrb/mrb_error.h 2016-01-12 11:24:56 +0900 (e688050) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_ERROR_H -#define GRN_MRB_ERROR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_error_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ERROR_H */ Modified: lib/mrb/mrb_expr.h (+2 -4) =================================================================== --- lib/mrb/mrb_expr.h 2016-01-12 10:37:22 +0900 (85c65e3) +++ lib/mrb/mrb_expr.h 2016-01-12 11:24:56 +0900 (14a5f97) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_EXPR_H -#define GRN_MRB_EXPR_H +#pragma once #include "../grn_ctx.h" #include "../grn_expr.h" @@ -42,4 +41,3 @@ unsigned int grn_mrb_expr_estimate_size(grn_ctx *ctx, } #endif -#endif /* GRN_MRB_EXPR_H */ Modified: lib/mrb/mrb_fixed_size_column.h (+2 -4) =================================================================== --- lib/mrb/mrb_fixed_size_column.h 2016-01-12 10:37:22 +0900 (1037716) +++ lib/mrb/mrb_fixed_size_column.h 2016-01-12 11:24:56 +0900 (95d8f50) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_FIXED_SIZE_COLUMN_H -#define GRN_MRB_FIXED_SIZE_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_fixed_size_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_FIXED_SIZE_COLUMN_H */ Modified: lib/mrb/mrb_hash_table.h (+2 -4) =================================================================== --- lib/mrb/mrb_hash_table.h 2016-01-12 10:37:22 +0900 (223267b) +++ lib/mrb/mrb_hash_table.h 2016-01-12 11:24:56 +0900 (0fc40b2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_HASH_TABLE_H -#define GRN_MRB_HASH_TABLE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_hash_table_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_HASH_TABLE_H */ Modified: lib/mrb/mrb_id.h (+2 -4) =================================================================== --- lib/mrb/mrb_id.h 2016-01-12 10:37:22 +0900 (fcfd803) +++ lib/mrb/mrb_id.h 2016-01-12 11:24:56 +0900 (ff27734) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_ID_H -#define GRN_MRB_ID_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_id_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ID_H */ Modified: lib/mrb/mrb_index_column.h (+2 -4) =================================================================== --- lib/mrb/mrb_index_column.h 2016-01-12 10:37:22 +0900 (307448f) +++ lib/mrb/mrb_index_column.h 2016-01-12 11:24:56 +0900 (0aa29ee) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_INDEX_COLUMN_H -#define GRN_MRB_INDEX_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_index_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_INDEX_COLUMN_H */ Modified: lib/mrb/mrb_index_cursor.h (+2 -4) =================================================================== --- lib/mrb/mrb_index_cursor.h 2016-01-12 10:37:22 +0900 (afbad53) +++ lib/mrb/mrb_index_cursor.h 2016-01-12 11:24:56 +0900 (0c9d7b5) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_INDEX_CURSOR_H -#define GRN_MRB_INDEX_CURSOR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_index_cursor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_INDEX_CURSOR_H */ Modified: lib/mrb/mrb_logger.h (+2 -4) =================================================================== --- lib/mrb/mrb_logger.h 2016-01-12 10:37:22 +0900 (358313b) +++ lib/mrb/mrb_logger.h 2016-01-12 11:24:56 +0900 (c6a1ede) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_LOGGER_H -#define GRN_MRB_LOGGER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_logger_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_LOGGER_H */ Modified: lib/mrb/mrb_object.h (+2 -4) =================================================================== --- lib/mrb/mrb_object.h 2016-01-12 10:37:22 +0900 (82468bd) +++ lib/mrb/mrb_object.h 2016-01-12 11:24:56 +0900 (0eebe54) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_OBJECT_H -#define GRN_MRB_OBJECT_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ mrb_value grn_mrb_object_inspect(mrb_state *mrb, mrb_value self); } #endif -#endif /* GRN_MRB_OBJECT_H */ Modified: lib/mrb/mrb_object_flags.h (+2 -4) =================================================================== --- lib/mrb/mrb_object_flags.h 2016-01-12 10:37:22 +0900 (60c8222) +++ lib/mrb/mrb_object_flags.h 2016-01-12 11:24:56 +0900 (59e5680) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_OBJECT_FLAGS_H -#define GRN_MRB_OBJECT_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_object_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_OBJECT_FLAGS_H */ Modified: lib/mrb/mrb_operator.h (+2 -4) =================================================================== --- lib/mrb/mrb_operator.h 2016-01-12 10:37:22 +0900 (b76c498) +++ lib/mrb/mrb_operator.h 2016-01-12 11:24:56 +0900 (adbb3e2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014-2015 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_OPERATOR_H -#define GRN_MRB_OPERATOR_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ grn_operator grn_mrb_value_to_operator(mrb_state *mrb, mrb_value mrb_op); } #endif -#endif /* GRN_MRB_OPERATOR_H */ Modified: lib/mrb/mrb_options.h (+2 -4) =================================================================== --- lib/mrb/mrb_options.h 2016-01-12 10:37:22 +0900 (1aa547d) +++ lib/mrb/mrb_options.h 2016-01-12 11:24:56 +0900 (1523f05) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_OPTIONS_H -#define GRN_MRB_OPTIONS_H +#pragma once #include "../grn_ctx.h" @@ -37,4 +36,3 @@ mrb_value grn_mrb_options_get_static(mrb_state *mrb, } #endif -#endif /* GRN_MRB_OPTIONS_H */ Modified: lib/mrb/mrb_patricia_trie.h (+2 -4) =================================================================== --- lib/mrb/mrb_patricia_trie.h 2016-01-12 10:37:22 +0900 (f281b25) +++ lib/mrb/mrb_patricia_trie.h 2016-01-12 11:24:56 +0900 (9a34bc2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_PATRICIA_TRIE_H -#define GRN_MRB_PATRICIA_TRIE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_patricia_trie_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_PATRICIA_TRIE_H */ Modified: lib/mrb/mrb_procedure.h (+2 -4) =================================================================== --- lib/mrb/mrb_procedure.h 2016-01-12 10:37:22 +0900 (36bd10f) +++ lib/mrb/mrb_procedure.h 2016-01-12 11:24:56 +0900 (3213533) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_PROCEDURE_H -#define GRN_MRB_PROCEDURE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_procedure_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_PROCEDURE_H */ Modified: lib/mrb/mrb_query_logger.h (+2 -4) =================================================================== --- lib/mrb/mrb_query_logger.h 2016-01-12 10:37:22 +0900 (41a7e28) +++ lib/mrb/mrb_query_logger.h 2016-01-12 11:24:56 +0900 (8293f39) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_QUERY_LOGGER_H -#define GRN_MRB_QUERY_LOGGER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_query_logger_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_QUERY_LOGGER_H */ Modified: lib/mrb/mrb_record.h (+2 -5) =================================================================== --- lib/mrb/mrb_record.h 2016-01-12 10:37:22 +0900 (3a7eccb) +++ lib/mrb/mrb_record.h 2016-01-12 11:24:56 +0900 (ad6e01d) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_RECORD_H -#define GRN_MRB_RECORD_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_record_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_RECORD_H */ Modified: lib/mrb/mrb_table.h (+2 -4) =================================================================== --- lib/mrb/mrb_table.h 2016-01-12 10:37:22 +0900 (000088f) +++ lib/mrb/mrb_table.h 2016-01-12 11:24:56 +0900 (3af173a) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_H -#define GRN_MRB_TABLE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_H */ Modified: lib/mrb/mrb_table_cursor.h (+2 -4) =================================================================== --- lib/mrb/mrb_table_cursor.h 2016-01-12 10:37:22 +0900 (f05ab09) +++ lib/mrb/mrb_table_cursor.h 2016-01-12 11:24:56 +0900 (6d3e2c4) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_CURSOR_H -#define GRN_MRB_TABLE_CURSOR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_cursor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_CURSOR_H */ Modified: lib/mrb/mrb_table_cursor_flags.h (+2 -4) =================================================================== --- lib/mrb/mrb_table_cursor_flags.h 2016-01-12 10:37:22 +0900 (f336cde) +++ lib/mrb/mrb_table_cursor_flags.h 2016-01-12 11:24:56 +0900 (058de5e) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_CURSOR_FLAGS_H -#define GRN_MRB_TABLE_CURSOR_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_cursor_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_CURSOR_FLAGS_H */ Modified: lib/mrb/mrb_table_group_flags.h (+2 -4) =================================================================== --- lib/mrb/mrb_table_group_flags.h 2016-01-12 10:37:22 +0900 (fda2a9b) +++ lib/mrb/mrb_table_group_flags.h 2016-01-12 11:24:56 +0900 (1c80df3) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_GROUP_FLAGS_H -#define GRN_MRB_TABLE_GROUP_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_group_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_GROUP_FLAGS_H */ Modified: lib/mrb/mrb_table_group_result.h (+2 -5) =================================================================== --- lib/mrb/mrb_table_group_result.h 2016-01-12 10:37:22 +0900 (cc3c70f) +++ lib/mrb/mrb_table_group_result.h 2016-01-12 11:24:56 +0900 (87615eb) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_GROUP_RESULT_H -#define GRN_MRB_TABLE_GROUP_RESULT_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_table_group_result_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_TABLE_GROUP_RESULT_H */ Modified: lib/mrb/mrb_table_sort_flags.h (+2 -5) =================================================================== --- lib/mrb/mrb_table_sort_flags.h 2016-01-12 10:37:22 +0900 (0b5c40b) +++ lib/mrb/mrb_table_sort_flags.h 2016-01-12 11:24:56 +0900 (a8e35f4) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_SORT_FLAGS_H -#define GRN_MRB_TABLE_SORT_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_table_sort_flags_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_TABLE_SORT_FLAGS_H */ Modified: lib/mrb/mrb_table_sort_key.h (+2 -4) =================================================================== --- lib/mrb/mrb_table_sort_key.h 2016-01-12 10:37:22 +0900 (1d56bcd) +++ lib/mrb/mrb_table_sort_key.h 2016-01-12 11:24:56 +0900 (9825ca8) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TABLE_SORT_KEY_H -#define GRN_MRB_TABLE_SORT_KEY_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_sort_key_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_SORT_KEY_H */ Modified: lib/mrb/mrb_type.h (+2 -4) =================================================================== --- lib/mrb/mrb_type.h 2016-01-12 10:37:22 +0900 (f861674) +++ lib/mrb/mrb_type.h 2016-01-12 11:24:56 +0900 (17b4394) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_TYPE_H -#define GRN_MRB_TYPE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_type_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TYPE_H */ Modified: lib/mrb/mrb_variable_size_column.h (+2 -4) =================================================================== --- lib/mrb/mrb_variable_size_column.h 2016-01-12 10:37:22 +0900 (c904e70) +++ lib/mrb/mrb_variable_size_column.h 2016-01-12 11:24:56 +0900 (16d5403) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_VARIABLE_SIZE_COLUMN_H -#define GRN_MRB_VARIABLE_SIZE_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_variable_size_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_VARIABLE_SIZE_COLUMN_H */ Modified: lib/mrb/mrb_void.h (+2 -4) =================================================================== --- lib/mrb/mrb_void.h 2016-01-12 10:37:22 +0900 (474d780) +++ lib/mrb/mrb_void.h 2016-01-12 11:24:56 +0900 (3169334) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2014 Brazil + Copyright(C) 2014-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_VOID_H -#define GRN_MRB_VOID_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_void_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_VOID_H */ Modified: lib/mrb/mrb_writer.h (+2 -4) =================================================================== --- lib/mrb/mrb_writer.h 2016-01-12 10:37:22 +0900 (a6b4a6b) +++ lib/mrb/mrb_writer.h 2016-01-12 11:24:56 +0900 (a4de026) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_WRITER_H -#define GRN_MRB_WRITER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_writer_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_WRITER_H */ Modified: lib/ts/ts_buf.h (+2 -4) =================================================================== --- lib/ts/ts_buf.h 2016-01-12 10:37:22 +0900 (c9c86ff) +++ lib/ts/ts_buf.h 2016-01-12 11:24:56 +0900 (64caec9) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_BUF_H -#define GRN_TS_BUF_H +#pragma once #include "../grn.h" @@ -110,4 +109,3 @@ grn_rc grn_ts_rbuf_resize(grn_ctx *ctx, grn_ts_rbuf *rbuf, } #endif -#endif /* GRN_TS_BUF_H */ Modified: lib/ts/ts_cursor.h (+2 -4) =================================================================== --- lib/ts/ts_cursor.h 2016-01-12 10:37:22 +0900 (65bc0fd) +++ lib/ts/ts_cursor.h 2016-01-12 11:24:56 +0900 (f05aa75) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_CURSOR_H -#define GRN_TS_CURSOR_H +#pragma once #include "../grn.h" @@ -58,4 +57,3 @@ grn_rc grn_ts_cursor_read(grn_ctx *ctx, grn_ts_cursor *cursor, } #endif -#endif /* GRN_TS_CURSOR_H */ Modified: lib/ts/ts_expr.h (+2 -4) =================================================================== --- lib/ts/ts_expr.h 2016-01-12 10:37:22 +0900 (d32ce9f) +++ lib/ts/ts_expr.h 2016-01-12 11:24:56 +0900 (be370e8) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_EXPR_H -#define GRN_TS_EXPR_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_rc grn_ts_expr_adjust(grn_ctx *ctx, grn_ts_expr *expr, } #endif -#endif /* GRN_TS_EXPR_H */ Modified: lib/ts/ts_expr_builder.h (+2 -4) =================================================================== --- lib/ts/ts_expr_builder.h 2016-01-12 10:37:22 +0900 (35669be) +++ lib/ts/ts_expr_builder.h 2016-01-12 11:24:56 +0900 (2e2eb43) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_EXPR_BUILDER_H -#define GRN_TS_EXPR_BUILDER_H +#pragma once #include "../grn.h" @@ -127,4 +126,3 @@ grn_rc grn_ts_expr_builder_end_subexpr(grn_ctx *ctx, } #endif -#endif /* GRN_TS_EXPR_BUILDER_H */ Modified: lib/ts/ts_expr_node.h (+2 -4) =================================================================== --- lib/ts/ts_expr_node.h 2016-01-12 10:37:22 +0900 (2073177) +++ lib/ts/ts_expr_node.h 2016-01-12 11:24:56 +0900 (40e7022) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_EXPR_NODE_H -#define GRN_TS_EXPR_NODE_H +#pragma once #include "../grn.h" @@ -127,4 +126,3 @@ grn_rc grn_ts_expr_node_adjust(grn_ctx *ctx, grn_ts_expr_node *node, } #endif -#endif /* GRN_TS_EXPR_NODE_H */ Modified: lib/ts/ts_expr_parser.h (+2 -4) =================================================================== --- lib/ts/ts_expr_parser.h 2016-01-12 10:37:22 +0900 (9c9122e) +++ lib/ts/ts_expr_parser.h 2016-01-12 11:24:56 +0900 (1023356) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_EXPR_PARSER_H -#define GRN_TS_EXPR_PARSER_H +#pragma once #include "ts_expr.h" #include "ts_expr_builder.h" @@ -106,4 +105,3 @@ grn_rc grn_ts_expr_parser_split(grn_ctx *ctx, grn_ts_expr_parser *parser, } #endif -#endif /* GRN_TS_EXPR_PARSER_H */ Modified: lib/ts/ts_log.h (+2 -4) =================================================================== --- lib/ts/ts_log.h 2016-01-12 10:37:22 +0900 (b671a34) +++ lib/ts/ts_log.h 2016-01-12 11:24:56 +0900 (7619d60) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_LOG_H -#define GRN_TS_LOG_H +#pragma once #include "../grn.h" #include "../grn_ctx.h" @@ -45,4 +44,3 @@ extern "C" { } #endif -#endif /* GRN_TS_LOG_H */ Modified: lib/ts/ts_op.h (+2 -4) =================================================================== --- lib/ts/ts_op.h 2016-01-12 10:37:22 +0900 (8e16415) +++ lib/ts/ts_op.h 2016-01-12 11:24:56 +0900 (3bdfcf4) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015-2016 Brazil + Copyright(C) 2015-2016-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_OP_H -#define GRN_TS_OP_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_ts_op_precedence grn_ts_op_get_precedence(grn_ts_op_type op_type); } #endif -#endif /* GRN_TS_OP_H */ Modified: lib/ts/ts_plan.h (+2 -4) =================================================================== --- lib/ts/ts_plan.h 2016-01-12 10:37:22 +0900 (c96ee30) +++ lib/ts/ts_plan.h 2016-01-12 11:24:56 +0900 (c441ade) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_PLAN_H -#define GRN_TS_PLAN_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_rc grn_ts_planner_push_sorter(grn_ctx *ctx, grn_ts_planner *planner, } #endif -#endif /* GRN_TS_PLAN_H */ Modified: lib/ts/ts_sorter.h (+2 -4) =================================================================== --- lib/ts/ts_sorter.h 2016-01-12 10:37:22 +0900 (b97db13) +++ lib/ts/ts_sorter.h 2016-01-12 11:24:56 +0900 (069154d) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_SORTER_H -#define GRN_TS_SORTER_H +#pragma once #include "../grn.h" @@ -97,4 +96,3 @@ grn_rc grn_ts_sorter_builder_push(grn_ctx *ctx, grn_ts_sorter_builder *builder, } #endif -#endif /* GRN_TS_SORTER_H */ Modified: lib/ts/ts_str.h (+2 -4) =================================================================== --- lib/ts/ts_str.h 2016-01-12 10:37:22 +0900 (08acfb5) +++ lib/ts/ts_str.h 2016-01-12 11:24:56 +0900 (bca07b9) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_STR_H -#define GRN_TS_STR_H +#pragma once #include "../grn.h" @@ -105,4 +104,3 @@ grn_ts_bool grn_ts_str_is_value_name(grn_ts_str str); } #endif -#endif /* GRN_TS_STR_H */ Modified: lib/ts/ts_types.h (+2 -4) =================================================================== --- lib/ts/ts_types.h 2016-01-12 10:37:22 +0900 (60646ab) +++ lib/ts/ts_types.h 2016-01-12 11:24:56 +0900 (5a667e2) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_TYPES_H -#define GRN_TS_TYPES_H +#pragma once #include "../grn.h" @@ -167,4 +166,3 @@ typedef union { } #endif -#endif /* GRN_TS_TYPES_H */ Modified: lib/ts/ts_util.h (+2 -4) =================================================================== --- lib/ts/ts_util.h 2016-01-12 10:37:22 +0900 (6d4f57a) +++ lib/ts/ts_util.h 2016-01-12 11:24:56 +0900 (2ffbdd6) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015 Brazil + Copyright(C) 2015-2016 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_TS_UTIL_H -#define GRN_TS_UTIL_H +#pragma once #include "../grn.h" @@ -60,4 +59,3 @@ const void *grn_ts_table_get_value(grn_ctx *ctx, grn_obj *table, grn_ts_id id); } #endif -#endif /* GRN_TS_UTIL_H */
