Minor cleanup

PiperOrigin-RevId: 158268933
TeeeJay · Jun 7, 2017 · 1d67379 · 1d67379
1 parent 4199775
commit 1d67379
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/tensorflow/compiler/xla/service/copy_insertion.cc b/tensorflow/compiler/xla/service/copy_insertion.cc
@@ -167,7 +167,9 @@ bool InstructionCopier::HasAllIndicesFalse() const {
  bool all_indices_false = true;
  indices_to_copy_.ForEachElement(
  [&all_indices_false](const ShapeIndex& /*index*/, bool data) {
- if (data) all_indices_false = false;
+ if (data) {
+ all_indices_false = false;
+ }
  });
  return all_indices_false;
 }

diff --git a/tensorflow/compiler/xla/tests/round_trip_transfer_test.cc b/tensorflow/compiler/xla/tests/round_trip_transfer_test.cc
@@ -29,7 +29,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
-#include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 

diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
@@ -17,7 +17,6 @@ limitations under the License.
 #include <vector>
 #include "tensorflow/core/framework/function.pb.h"
 #include "tensorflow/core/framework/function_testlib.h"
-#include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/kernels/ops_util.h"

diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
@@ -57,11 +57,11 @@ bool IsValidNodeName(StringPiece s, bool allow_internal_ops) {
 class GraphConstructor {
  public:
  struct Options {
- Options(const GraphConstructorOptions& in)
+ Options(const GraphConstructorOptions& in) // NOLINT(runtime/explicit)
  : allow_internal_ops(in.allow_internal_ops),
  expect_device_spec(in.expect_device_spec),
  importing(false) {}
- Options(const ImportGraphDefOptions& in)
+ Options(const ImportGraphDefOptions& in) // NOLINT(runtime/explicit)
  : allow_internal_ops(false),
  expect_device_spec(false),
  prefix(in.prefix.empty() || StringPiece(in.prefix).ends_with("/")

diff --git a/tensorflow/core/platform/hadoop/hadoop_file_system.cc b/tensorflow/core/platform/hadoop/hadoop_file_system.cc
@@ -124,7 +124,6 @@ class LibHDFS {
  // libhdfs.so is installed in non-standard location
  status_ = TryLoadAndBind(kLibHdfsDso, &handle_);
  }
- return;
  }
 
  Status status_;