From b481783fe0e00a86f6feb20a8dcad5fc4fc936a4 Mon Sep 17 00:00:00 2001 From: Josh Levenberg Date: Thu, 21 Jan 2016 14:59:18 -0800 Subject: Move #include out of port.h to users of std::vector<>. After this we can replace port.h with types.h. Change: 112727463 --- tensorflow/core/lib/core/coding_test.cc | 1 + tensorflow/core/lib/core/command_line_flags.h | 1 + tensorflow/core/lib/gtl/array_slice_internal.h | 1 + tensorflow/core/lib/gtl/edit_distance_test.cc | 1 + tensorflow/core/lib/gtl/inlined_vector.h | 1 + tensorflow/core/lib/gtl/map_util.h | 1 - tensorflow/core/lib/histogram/histogram.cc | 1 + tensorflow/core/lib/histogram/histogram.h | 1 + tensorflow/core/lib/io/block.cc | 1 - tensorflow/core/lib/io/inputbuffer_test.cc | 1 + tensorflow/core/lib/io/match.cc | 1 + tensorflow/core/lib/io/match_test.cc | 1 + tensorflow/core/lib/io/table_test.cc | 1 + tensorflow/core/lib/jpeg/jpeg_mem.h | 1 - tensorflow/core/lib/random/distribution_sampler.h | 1 - tensorflow/core/lib/strings/str_util.cc | 1 + tensorflow/core/lib/strings/str_util.h | 1 + tensorflow/core/lib/strings/str_util_test.cc | 1 + tensorflow/core/lib/strings/stringprintf.cc | 1 - tensorflow/core/lib/strings/stringprintf.h | 1 - 20 files changed, 14 insertions(+), 6 deletions(-) (limited to 'tensorflow/core/lib') diff --git a/tensorflow/core/lib/core/coding_test.cc b/tensorflow/core/lib/core/coding_test.cc index 6f5855c893..1c58eedaa1 100644 --- a/tensorflow/core/lib/core/coding_test.cc +++ b/tensorflow/core/lib/core/coding_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/core/coding.h" +#include #include "tensorflow/core/platform/test.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/command_line_flags.h b/tensorflow/core/lib/core/command_line_flags.h index 9e10b3dd57..bfd15292fa 100644 --- a/tensorflow/core/lib/core/command_line_flags.h +++ b/tensorflow/core/lib/core/command_line_flags.h @@ -16,6 +16,7 @@ limitations under the License. #ifndef TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_ #define TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_ +#include #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" diff --git a/tensorflow/core/lib/gtl/array_slice_internal.h b/tensorflow/core/lib/gtl/array_slice_internal.h index 90f2d6f309..ff2d49b041 100644 --- a/tensorflow/core/lib/gtl/array_slice_internal.h +++ b/tensorflow/core/lib/gtl/array_slice_internal.h @@ -28,6 +28,7 @@ limitations under the License. #include #include #include +#include #include "tensorflow/core/platform/logging.h" namespace tensorflow { diff --git a/tensorflow/core/lib/gtl/edit_distance_test.cc b/tensorflow/core/lib/gtl/edit_distance_test.cc index 3db9772af4..cc1a259310 100644 --- a/tensorflow/core/lib/gtl/edit_distance_test.cc +++ b/tensorflow/core/lib/gtl/edit_distance_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/gtl/edit_distance.h" +#include #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/test.h" diff --git a/tensorflow/core/lib/gtl/inlined_vector.h b/tensorflow/core/lib/gtl/inlined_vector.h index 718c85a22b..c144a11556 100644 --- a/tensorflow/core/lib/gtl/inlined_vector.h +++ b/tensorflow/core/lib/gtl/inlined_vector.h @@ -39,6 +39,7 @@ limitations under the License. #include #include #include +#include #include "tensorflow/core/lib/gtl/manual_constructor.h" #include "tensorflow/core/platform/logging.h" diff --git a/tensorflow/core/lib/gtl/map_util.h b/tensorflow/core/lib/gtl/map_util.h index 3433081882..cb4bcd61ad 100644 --- a/tensorflow/core/lib/gtl/map_util.h +++ b/tensorflow/core/lib/gtl/map_util.h @@ -25,7 +25,6 @@ limitations under the License. #include #include #include -#include namespace tensorflow { namespace gtl { diff --git a/tensorflow/core/lib/histogram/histogram.cc b/tensorflow/core/lib/histogram/histogram.cc index 6da972dcb0..d758510279 100644 --- a/tensorflow/core/lib/histogram/histogram.cc +++ b/tensorflow/core/lib/histogram/histogram.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/lib/histogram/histogram.h" #include #include +#include #include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/platform/logging.h" diff --git a/tensorflow/core/lib/histogram/histogram.h b/tensorflow/core/lib/histogram/histogram.h index c1f65a2a98..4ad176c4ae 100644 --- a/tensorflow/core/lib/histogram/histogram.h +++ b/tensorflow/core/lib/histogram/histogram.h @@ -17,6 +17,7 @@ limitations under the License. #define TENSORFLOW_LIB_HISTOGRAM_HISTOGRAM_H_ #include +#include #include "tensorflow/core/lib/gtl/array_slice.h" #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" diff --git a/tensorflow/core/lib/io/block.cc b/tensorflow/core/lib/io/block.cc index 8eb4a882b6..532322e43b 100644 --- a/tensorflow/core/lib/io/block.cc +++ b/tensorflow/core/lib/io/block.cc @@ -18,7 +18,6 @@ limitations under the License. #include "tensorflow/core/lib/io/block.h" #include -#include #include "tensorflow/core/lib/core/coding.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/io/format.h" diff --git a/tensorflow/core/lib/io/inputbuffer_test.cc b/tensorflow/core/lib/io/inputbuffer_test.cc index 98c4c20d4f..17b8cbb363 100644 --- a/tensorflow/core/lib/io/inputbuffer_test.cc +++ b/tensorflow/core/lib/io/inputbuffer_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/io/inputbuffer.h" +#include #include "tensorflow/core/public/env.h" #include "tensorflow/core/lib/core/errors.h" diff --git a/tensorflow/core/lib/io/match.cc b/tensorflow/core/lib/io/match.cc index 209148cf22..c5d42eeef1 100644 --- a/tensorflow/core/lib/io/match.cc +++ b/tensorflow/core/lib/io/match.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/io/match.h" #include +#include #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/public/env.h" diff --git a/tensorflow/core/lib/io/match_test.cc b/tensorflow/core/lib/io/match_test.cc index 741c37c471..123bf42ed4 100644 --- a/tensorflow/core/lib/io/match_test.cc +++ b/tensorflow/core/lib/io/match_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/io/match.h" #include +#include #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/strings/strcat.h" diff --git a/tensorflow/core/lib/io/table_test.cc b/tensorflow/core/lib/io/table_test.cc index dcc1eb5558..b3adeac77b 100644 --- a/tensorflow/core/lib/io/table_test.cc +++ b/tensorflow/core/lib/io/table_test.cc @@ -17,6 +17,7 @@ limitations under the License. #include #include +#include #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/io/block.h" #include "tensorflow/core/lib/io/block_builder.h" diff --git a/tensorflow/core/lib/jpeg/jpeg_mem.h b/tensorflow/core/lib/jpeg/jpeg_mem.h index 82701466f0..92a87b6116 100644 --- a/tensorflow/core/lib/jpeg/jpeg_mem.h +++ b/tensorflow/core/lib/jpeg/jpeg_mem.h @@ -23,7 +23,6 @@ limitations under the License. #include #include -#include #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/platform/port.h" diff --git a/tensorflow/core/lib/random/distribution_sampler.h b/tensorflow/core/lib/random/distribution_sampler.h index 8c41826379..8b4e1157c1 100644 --- a/tensorflow/core/lib/random/distribution_sampler.h +++ b/tensorflow/core/lib/random/distribution_sampler.h @@ -33,7 +33,6 @@ limitations under the License. #include #include -#include #include "tensorflow/core/lib/gtl/array_slice.h" #include "tensorflow/core/lib/random/simple_philox.h" diff --git a/tensorflow/core/lib/strings/str_util.cc b/tensorflow/core/lib/strings/str_util.cc index 5a6a888d3f..4ef34ad6ae 100644 --- a/tensorflow/core/lib/strings/str_util.cc +++ b/tensorflow/core/lib/strings/str_util.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/str_util.h" #include +#include namespace tensorflow { namespace str_util { diff --git a/tensorflow/core/lib/strings/str_util.h b/tensorflow/core/lib/strings/str_util.h index a485d3e4a9..9d5ad81504 100644 --- a/tensorflow/core/lib/strings/str_util.h +++ b/tensorflow/core/lib/strings/str_util.h @@ -17,6 +17,7 @@ limitations under the License. #define TENSORFLOW_LIB_STRINGS_STR_UTIL_H_ #include +#include #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/gtl/array_slice.h" #include "tensorflow/core/lib/strings/strcat.h" diff --git a/tensorflow/core/lib/strings/str_util_test.cc b/tensorflow/core/lib/strings/str_util_test.cc index 0ed9aa8b80..0fdae33ad8 100644 --- a/tensorflow/core/lib/strings/str_util_test.cc +++ b/tensorflow/core/lib/strings/str_util_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/str_util.h" +#include #include "tensorflow/core/platform/test.h" namespace tensorflow { diff --git a/tensorflow/core/lib/strings/stringprintf.cc b/tensorflow/core/lib/strings/stringprintf.cc index 975406cd64..a28bcc99b8 100644 --- a/tensorflow/core/lib/strings/stringprintf.cc +++ b/tensorflow/core/lib/strings/stringprintf.cc @@ -18,7 +18,6 @@ limitations under the License. #include #include // For va_list and related operations #include // MSVC requires this for _vsnprintf -#include namespace tensorflow { namespace strings { diff --git a/tensorflow/core/lib/strings/stringprintf.h b/tensorflow/core/lib/strings/stringprintf.h index adbdd2090a..b114c8e54c 100644 --- a/tensorflow/core/lib/strings/stringprintf.h +++ b/tensorflow/core/lib/strings/stringprintf.h @@ -25,7 +25,6 @@ limitations under the License. #include #include -#include #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" -- cgit v1.2.3