Kouhei Sutou
null+****@clear*****
Mon Aug 14 11:23:01 JST 2017
Kouhei Sutou 2017-08-14 11:23:01 +0900 (Mon, 14 Aug 2017) New Revision: f8c0b197dada89ad33d3070dd3adae7cd811ec0b https://github.com/mroonga/mroonga/commit/f8c0b197dada89ad33d3070dd3adae7cd811ec0b Message: Include groonga.h after MySQL headers Modified files: lib/mrn_database_manager.hpp lib/mrn_multiple_column_key_codec.hpp lib/mrn_query_parser.hpp Modified: lib/mrn_database_manager.hpp (+2 -1) =================================================================== --- lib/mrn_database_manager.hpp 2017-08-14 09:19:38 +0900 (de20f5bc) +++ lib/mrn_database_manager.hpp 2017-08-14 11:23:01 +0900 (c802dd44) @@ -22,9 +22,10 @@ #ifndef MRN_DATABASE_MANAGER_HPP_ #define MRN_DATABASE_MANAGER_HPP_ -#include <groonga.h> #include "mrn_database.hpp" +#include <groonga.h> + namespace mrn { class DatabaseManager { public: Modified: lib/mrn_multiple_column_key_codec.hpp (+2 -2) =================================================================== --- lib/mrn_multiple_column_key_codec.hpp 2017-08-14 09:19:38 +0900 (2b3f935d) +++ lib/mrn_multiple_column_key_codec.hpp 2017-08-14 11:23:01 +0900 (14003cda) @@ -20,11 +20,11 @@ #ifndef MRN_MULTIPLE_COLUMN_KEY_CODEC_HPP_ #define MRN_MULTIPLE_COLUMN_KEY_CODEC_HPP_ -#include <groonga.h> - #include <mrn_mysql.h> #include <mrn_mysql_compat.h> +#include <groonga.h> + namespace mrn { class MultipleColumnKeyCodec { public: Modified: lib/mrn_query_parser.hpp (+2 -2) =================================================================== --- lib/mrn_query_parser.hpp 2017-08-14 09:19:38 +0900 (e904b271) +++ lib/mrn_query_parser.hpp 2017-08-14 11:23:01 +0900 (d88a1267) @@ -19,11 +19,11 @@ #pragma once -#include <groonga.h> - #include <mrn_mysql.h> #include <mrn_mysql_compat.h> +#include <groonga.h> + namespace mrn { class QueryParser { public: -------------- next part -------------- HTML����������������������������... Download