Include a header for Datum from types.hpp.

groonga · Sep 11, 2014 · 76d9842 · 76d9842
1 parent eebf393
commit 76d9842
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 16 deletions.
diff --git a/benchmark/benchmark_adjuster.cpp b/benchmark/benchmark_adjuster.cpp
@@ -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"

diff --git a/include/grnxx/Makefile.am b/include/grnxx/Makefile.am
@@ -6,7 +6,6 @@ pkginclude_HEADERS =	\
 	array.hpp	\
 	column.hpp	\
 	cursor.hpp	\
-	datum.hpp	\
 	db.hpp		\
 	error.hpp	\
 	expression.hpp	\

diff --git a/include/grnxx/index.hpp b/include/grnxx/index.hpp
@@ -1,7 +1,6 @@
 #ifndef GRNXX_INDEX_HPP
 #define GRNXX_INDEX_HPP
 
-#include "grnxx/datum.hpp"
 #include "grnxx/name.hpp"
 #include "grnxx/types.hpp"
 

diff --git a/include/grnxx/types.hpp b/include/grnxx/types.hpp
@@ -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"

diff --git a/include/grnxx/types/Makefile.am b/include/grnxx/types/Makefile.am
@@ -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	\

diff --git a/include/grnxx/datum.hpp → include/grnxx/types/datum.hpp b/include/grnxx/datum.hpp → include/grnxx/types/datum.hpp
@@ -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
diff --git a/lib/grnxx/column.cpp b/lib/grnxx/column.cpp
@@ -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"

diff --git a/lib/grnxx/expression.cpp b/lib/grnxx/expression.cpp
@@ -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"
 

diff --git a/lib/grnxx/index.cpp b/lib/grnxx/index.cpp
@@ -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"
 

diff --git a/test/test_column.cpp b/test/test_column.cpp
@@ -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"

diff --git a/test/test_expression.cpp b/test/test_expression.cpp
@@ -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"

diff --git a/test/test_index.cpp b/test/test_index.cpp
@@ -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"

diff --git a/test/test_pipeline.cpp b/test/test_pipeline.cpp
@@ -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"

diff --git a/test/test_sorter.cpp b/test/test_sorter.cpp
@@ -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"

diff --git a/test/test_table.cpp b/test/test_table.cpp
@@ -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"