aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Derek Murray <mrry@google.com>2016-09-22 08:16:20 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-09-22 09:31:15 -0700
commit47980d7d62b5ae6909db9e8a3dc6dd6b3e9a3209 (patch)
tree8e11a4cd18c283ca99b8b4c8b397a99be27acb8b
parent2c4af2e65a2018540d949cfdba1fcb15d0121f80 (diff)
Add explicit gtl::ArraySlice cast for NodeBuilder::Inputs().
This is required for compilers that don't convert the `std::vector<>` to a `gtl::ArraySlice<>`. Change: 133960948
-rw-r--r--tensorflow/core/framework/fake_input.cc4
-rw-r--r--tensorflow/core/graph/node_builder.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/tensorflow/core/framework/fake_input.cc b/tensorflow/core/framework/fake_input.cc
index 1daf70cd2f..7a21dd5066 100644
--- a/tensorflow/core/framework/fake_input.cc
+++ b/tensorflow/core/framework/fake_input.cc
@@ -172,7 +172,7 @@ void FakeInputImpl::NSources(int n, DataType dt) const {
for (int i = 0; i < n; ++i) {
srcs.emplace_back(in_node_, i, dt);
}
- builder_->Input(srcs);
+ builder_->Input(gtl::ArraySlice<NodeDefBuilder::NodeOut>(srcs));
}
void FakeInputImpl::SourceList(DataTypeSlice dts) const {
@@ -181,7 +181,7 @@ void FakeInputImpl::SourceList(DataTypeSlice dts) const {
for (size_t i = 0; i < dts.size(); ++i) {
srcs.emplace_back(in_node_, i, dts[i]);
}
- builder_->Input(srcs);
+ builder_->Input(gtl::ArraySlice<NodeDefBuilder::NodeOut>(srcs));
}
} // namespace
diff --git a/tensorflow/core/graph/node_builder.cc b/tensorflow/core/graph/node_builder.cc
index 0e56886940..27d8929595 100644
--- a/tensorflow/core/graph/node_builder.cc
+++ b/tensorflow/core/graph/node_builder.cc
@@ -74,7 +74,7 @@ NodeBuilder& NodeBuilder::Input(gtl::ArraySlice<NodeOut> src_list) {
inputs_.emplace_back(node_out.node, node_out.index);
}
}
- def_builder_.Input(srcs);
+ def_builder_.Input(gtl::ArraySlice<NodeDefBuilder::NodeOut>(srcs));
return *this;
}