From 166d890d514ae3c9370d978e8611c4f663385182 Mon Sep 17 00:00:00 2001 From: george Date: Tue, 7 Jun 2016 23:18:55 -0700 Subject: [PATCH] cleanup includes --- src/doim/cxx/cxx_file.h | 1 + src/doim/cxx/cxx_header.h | 4 ++-- src/doim/gtest/element_manager-utest.cpp | 1 + src/doim/gtest/fs/fs_directory-utest.cpp | 1 + src/dom/cxx/cxx_program.h | 4 +--- src/engine/cxx_engine.cpp | 2 ++ src/main.cpp | 1 + src/parser/gtest/dbs/dbs_parser-utest.cpp | 3 +-- src/rpc/client/client.cpp | 1 - src/task/cxx/cxx_source_crc_task.h | 2 -- src/task/cxx/cxx_source_headers_task.h | 1 - src/tool/protobuf/protobuf_compiler.cpp | 1 - src/tool/protobuf/protobuf_compiler.h | 1 - 13 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/doim/cxx/cxx_file.h b/src/doim/cxx/cxx_file.h index 972db8b..5527a0b 100644 --- a/src/doim/cxx/cxx_file.h +++ b/src/doim/cxx/cxx_file.h @@ -10,6 +10,7 @@ #include "doim/set.hpp" #include #include +#include #include namespace doim diff --git a/src/doim/cxx/cxx_header.h b/src/doim/cxx/cxx_header.h index c1e1e61..b72639a 100644 --- a/src/doim/cxx/cxx_header.h +++ b/src/doim/cxx/cxx_header.h @@ -5,14 +5,14 @@ #include "doim/cxx/cxx_file.h" #include "doim/cxx/cxx_include_directory.h" +#include "doim/fs/fs_directory.h" #include "doim/fs/fs_file.h" -#include "doim/protobuf/protobuf_file.h" #include "doim/element.hpp" #include "doim/set.hpp" -#include #include #include #include +#include namespace doim { diff --git a/src/doim/gtest/element_manager-utest.cpp b/src/doim/gtest/element_manager-utest.cpp index 446b751..55272e3 100644 --- a/src/doim/gtest/element_manager-utest.cpp +++ b/src/doim/gtest/element_manager-utest.cpp @@ -6,6 +6,7 @@ #include "gtest/framework.h" #include #include +#include TEST(ElementManagerTest, unique) { diff --git a/src/doim/gtest/fs/fs_directory-utest.cpp b/src/doim/gtest/fs/fs_directory-utest.cpp index a3e46a0..5c03a7b 100644 --- a/src/doim/gtest/fs/fs_directory-utest.cpp +++ b/src/doim/gtest/fs/fs_directory-utest.cpp @@ -2,6 +2,7 @@ // #include "doim/fs/fs_directory.h" +#include "doim/fs/fs_relative_directory.h" #include "err/gtest/err_assert.h" #include "gtest/framework.h" #include diff --git a/src/dom/cxx/cxx_program.h b/src/dom/cxx/cxx_program.h index 13b2f14..d1e64f2 100644 --- a/src/dom/cxx/cxx_program.h +++ b/src/dom/cxx/cxx_program.h @@ -6,16 +6,14 @@ #include "dom/cxx/cxx_files_mixin.hpp" #include "dom/cxx/cxx_headers_mixin.hpp" #include "dom/cxx/cxx_library.h" +#include "dom/cxx/protobufs_mixin.hpp" #include "dom/element.hpp" #include "doim/cxx/cxx_include_directory.h" #include "doim/cxx/cxx_program.h" #include "doim/fs/fs_directory.h" #include "err/err.h" -#include #include #include -#include -#include namespace dom { diff --git a/src/engine/cxx_engine.cpp b/src/engine/cxx_engine.cpp index f12fea9..7677023 100644 --- a/src/engine/cxx_engine.cpp +++ b/src/engine/cxx_engine.cpp @@ -13,6 +13,8 @@ #include "task/tpool.h" #include "tpool/task_callback.h" #include "tpool/task_group.h" +#include "doim/cxx/cxx_header.h" +#include "doim/cxx/cxx_include_directory.h" #include "doim/cxx/cxx_program.h" #include "doim/fs/fs_file.h" #include "doim/protobuf/protobuf_file.h" diff --git a/src/main.cpp b/src/main.cpp index 99ed69d..99f2eda 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,6 +14,7 @@ #include "option/verbose.h" #include "doim/fs/fs_directory.h" #include "doim/fs/fs_file.h" +#include "doim/fs/fs_relative_file.h" #include "doim/generic/object.h" #include "doim/sys/sys_executable.h" #include "doim/tool/tool_command.h" diff --git a/src/parser/gtest/dbs/dbs_parser-utest.cpp b/src/parser/gtest/dbs/dbs_parser-utest.cpp index 96cf62d..03f1875 100644 --- a/src/parser/gtest/dbs/dbs_parser-utest.cpp +++ b/src/parser/gtest/dbs/dbs_parser-utest.cpp @@ -4,11 +4,10 @@ #include "parser/dbs/dbs_parser.h" #include "dom/cxx/cxx_library.h" #include "dom/cxx/cxx_program.h" -#include "doim/cxx/cxx_header.h" +#include "doim/cxx/cxx_file.h" #include "doim/fs/fs_directory.h" #include "doim/fs/fs_file.h" #include "doim/generic/object.h" -#include "doim/set.hpp" #include "gtest/framework.h" #include "gtest/test_resource.h" #include diff --git a/src/rpc/client/client.cpp b/src/rpc/client/client.cpp index a0bc24c..25fb4e0 100644 --- a/src/rpc/client/client.cpp +++ b/src/rpc/client/client.cpp @@ -2,7 +2,6 @@ // #include "rpc/client/client.h" -#include "rpc/rpc.pb.h" namespace rpc { diff --git a/src/task/cxx/cxx_source_crc_task.h b/src/task/cxx/cxx_source_crc_task.h index fd2b389..ad0d077 100644 --- a/src/task/cxx/cxx_source_crc_task.h +++ b/src/task/cxx/cxx_source_crc_task.h @@ -5,12 +5,10 @@ #include "task/crc_task.hpp" #include "doim/cxx/cxx_file.h" -#include "doim/cxx/cxx_header.h" #include "doim/cxx/cxx_include_directory.h" #include "doim/tag/tag.h" #include "err/err.h" #include -#include #include #include #include diff --git a/src/task/cxx/cxx_source_headers_task.h b/src/task/cxx/cxx_source_headers_task.h index 9331b6e..f3a5fba 100644 --- a/src/task/cxx/cxx_source_headers_task.h +++ b/src/task/cxx/cxx_source_headers_task.h @@ -9,7 +9,6 @@ #include "doim/tag/tag.h" #include "err/err.h" #include -#include #include #include #include diff --git a/src/tool/protobuf/protobuf_compiler.cpp b/src/tool/protobuf/protobuf_compiler.cpp index fc0892a..d60b48a 100644 --- a/src/tool/protobuf/protobuf_compiler.cpp +++ b/src/tool/protobuf/protobuf_compiler.cpp @@ -2,7 +2,6 @@ // #include "tool/protobuf/protobuf_compiler.h" -#include "doim/cxx/cxx_file.h" #include "doim/fs/fs_file.h" #include "doim/sys/sys_argument.h" #include "doim/sys/sys_command.h" diff --git a/src/tool/protobuf/protobuf_compiler.h b/src/tool/protobuf/protobuf_compiler.h index d6721f0..c1c8876 100644 --- a/src/tool/protobuf/protobuf_compiler.h +++ b/src/tool/protobuf/protobuf_compiler.h @@ -3,7 +3,6 @@ #pragma once -#include "doim/cxx/cxx_file.h" #include "doim/fs/fs_directory.h" #include "doim/protobuf/protobuf_file.h" #include "doim/sys/sys_command.h"