susumu.yata
null+****@clear*****
Thu Sep 11 15:59:52 JST 2014
susumu.yata 2014-09-11 15:59:52 +0900 (Thu, 11 Sep 2014) New Revision: 76d98427dff5c7606f476cc79c1e24275093c183 https://github.com/groonga/grnxx/commit/76d98427dff5c7606f476cc79c1e24275093c183 Message: Include a header for Datum from types.hpp. Modified files: benchmark/benchmark_adjuster.cpp include/grnxx/Makefile.am include/grnxx/index.hpp include/grnxx/types.hpp include/grnxx/types/Makefile.am lib/grnxx/column.cpp lib/grnxx/expression.cpp lib/grnxx/index.cpp test/test_column.cpp test/test_expression.cpp test/test_index.cpp test/test_pipeline.cpp test/test_sorter.cpp test/test_table.cpp Renamed files: include/grnxx/types/datum.hpp (from include/grnxx/datum.hpp) Modified: benchmark/benchmark_adjuster.cpp (+0 -1) =================================================================== --- benchmark/benchmark_adjuster.cpp 2014-09-11 14:31:15 +0900 (7862fa6) +++ benchmark/benchmark_adjuster.cpp 2014-09-11 15:59:52 +0900 (6b78ad9) @@ -22,7 +22,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/expression.hpp" Modified: include/grnxx/Makefile.am (+0 -1) =================================================================== --- include/grnxx/Makefile.am 2014-09-11 14:31:15 +0900 (2decda3) +++ include/grnxx/Makefile.am 2014-09-11 15:59:52 +0900 (b313a51) @@ -6,7 +6,6 @@ pkginclude_HEADERS = \ array.hpp \ column.hpp \ cursor.hpp \ - datum.hpp \ db.hpp \ error.hpp \ expression.hpp \ Modified: include/grnxx/index.hpp (+0 -1) =================================================================== --- include/grnxx/index.hpp 2014-09-11 14:31:15 +0900 (0af162b) +++ include/grnxx/index.hpp 2014-09-11 15:59:52 +0900 (baeaa23) @@ -1,7 +1,6 @@ #ifndef GRNXX_INDEX_HPP #define GRNXX_INDEX_HPP -#include "grnxx/datum.hpp" #include "grnxx/name.hpp" #include "grnxx/types.hpp" Modified: include/grnxx/types.hpp (+1 -0) =================================================================== --- include/grnxx/types.hpp 2014-09-11 14:31:15 +0900 (bfe44c1) +++ include/grnxx/types.hpp 2014-09-11 15:59:52 +0900 (c8b4966) @@ -4,6 +4,7 @@ #include "grnxx/types/base_types.hpp" #include "grnxx/types/constants.hpp" #include "grnxx/types/data_types.hpp" +#include "grnxx/types/datum.hpp" #include "grnxx/types/forward.hpp" #include "grnxx/types/geo_point.hpp" #include "grnxx/types/options.hpp" Modified: include/grnxx/types/Makefile.am (+1 -0) =================================================================== --- include/grnxx/types/Makefile.am 2014-09-11 14:31:15 +0900 (e85f2cd) +++ include/grnxx/types/Makefile.am 2014-09-11 15:59:52 +0900 (ecaede2) @@ -2,6 +2,7 @@ pkgincludedir = ${includedir}/${PACKAGE}/types pkginclude_HEADERS = \ base_types.hpp \ constants.hpp \ + datum.hpp \ data_types.hpp \ forward.hpp \ geo_point.hpp \ Renamed: include/grnxx/types/datum.hpp (+9 -4) 89% =================================================================== --- include/grnxx/datum.hpp 2014-09-11 14:31:15 +0900 (dd52e38) +++ include/grnxx/types/datum.hpp 2014-09-11 15:59:52 +0900 (d823ec3) @@ -1,7 +1,12 @@ -#ifndef GRNXX_DATUM_HPP -#define GRNXX_DATUM_HPP +#ifndef GRNXX_TYPES_DATUM_HPP +#define GRNXX_TYPES_DATUM_HPP -#include "grnxx/types.hpp" +#include "grnxx/types/base_types.hpp" +#include "grnxx/types/constants.hpp" +#include "grnxx/types/data_types.hpp" +#include "grnxx/types/geo_point.hpp" +#include "grnxx/types/string.hpp" +#include "grnxx/types/vector.hpp" namespace grnxx { @@ -128,4 +133,4 @@ class Datum { } // namespace grnxx -#endif // GRNXX_DATUM_HPP +#endif // GRNXX_TYPES_DATUM_HPP Modified: lib/grnxx/column.cpp (+0 -1) =================================================================== --- lib/grnxx/column.cpp 2014-09-11 14:31:15 +0900 (20aff78) +++ lib/grnxx/column.cpp 2014-09-11 15:59:52 +0900 (0bb09fe) @@ -2,7 +2,6 @@ #include "grnxx/column_impl.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/index.hpp" Modified: lib/grnxx/expression.cpp (+0 -1) =================================================================== --- lib/grnxx/expression.cpp 2014-09-11 14:31:15 +0900 (52d32b6) +++ lib/grnxx/expression.cpp 2014-09-11 15:59:52 +0900 (ee3d3c2) @@ -1,7 +1,6 @@ #include "grnxx/expression.hpp" #include "grnxx/column_impl.hpp" -#include "grnxx/datum.hpp" #include "grnxx/error.hpp" #include "grnxx/table.hpp" Modified: lib/grnxx/index.cpp (+0 -1) =================================================================== --- lib/grnxx/index.cpp 2014-09-11 14:31:15 +0900 (3efda5d) +++ lib/grnxx/index.cpp 2014-09-11 15:59:52 +0900 (0ef615c) @@ -3,7 +3,6 @@ #include "grnxx/column.hpp" #include "grnxx/column_impl.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/table.hpp" #include "grnxx/tree_index.hpp" Modified: test/test_column.cpp (+0 -1) =================================================================== --- test/test_column.cpp 2014-09-11 14:31:15 +0900 (eb6849c) +++ test/test_column.cpp 2014-09-11 15:59:52 +0900 (0d5f947) @@ -20,7 +20,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/table.hpp" Modified: test/test_expression.cpp (+0 -1) =================================================================== --- test/test_expression.cpp 2014-09-11 14:31:15 +0900 (5c53d8d) +++ test/test_expression.cpp 2014-09-11 15:59:52 +0900 (c58726b) @@ -21,7 +21,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/expression.hpp" Modified: test/test_index.cpp (+0 -1) =================================================================== --- test/test_index.cpp 2014-09-11 14:31:15 +0900 (46dd044) +++ test/test_index.cpp 2014-09-11 15:59:52 +0900 (bd2ab57) @@ -21,7 +21,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/index.hpp" Modified: test/test_pipeline.cpp (+0 -1) =================================================================== --- test/test_pipeline.cpp 2014-09-11 14:31:15 +0900 (d7088a4) +++ test/test_pipeline.cpp 2014-09-11 15:59:52 +0900 (b5f8fbe) @@ -21,7 +21,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/expression.hpp" Modified: test/test_sorter.cpp (+0 -1) =================================================================== --- test/test_sorter.cpp 2014-09-11 14:31:15 +0900 (4889796) +++ test/test_sorter.cpp 2014-09-11 15:59:52 +0900 (b8ad837) @@ -21,7 +21,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/expression.hpp" Modified: test/test_table.cpp (+0 -1) =================================================================== --- test/test_table.cpp 2014-09-11 14:31:15 +0900 (b84d68d) +++ test/test_table.cpp 2014-09-11 15:59:52 +0900 (09e4475) @@ -20,7 +20,6 @@ #include "grnxx/column.hpp" #include "grnxx/cursor.hpp" -#include "grnxx/datum.hpp" #include "grnxx/db.hpp" #include "grnxx/error.hpp" #include "grnxx/table.hpp" -------------- next part -------------- HTML����������������������������...Download