aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Manjunath Kudlur <keveman@gmail.com>2016-01-20 18:03:36 -0800
committerGravatar Manjunath Kudlur <keveman@gmail.com>2016-01-20 18:04:41 -0800
commit6bf5a24e8805c57a2d7e5741519a090228c76a89 (patch)
tree66282cf93b790b1a6d02606b5b349332ded8cff5
parent2d7b6485799802d4381cc8353617f3d2651f5530 (diff)
Change: 112640197
-rw-r--r--tensorflow/core/kernels/padding_fifo_queue.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/core/kernels/padding_fifo_queue.cc b/tensorflow/core/kernels/padding_fifo_queue.cc
index d2f8c06fdb..36646e1221 100644
--- a/tensorflow/core/kernels/padding_fifo_queue.cc
+++ b/tensorflow/core/kernels/padding_fifo_queue.cc
@@ -155,7 +155,7 @@ void PaddingFIFOQueue::TryDequeueMany(int num_elements, OpKernelContext* ctx,
// Expand sizes to match.
int64 max_val = 0;
for (const Tuple& t : tuples) {
- max_val = max(max_val, t[i].shape().dim_size(j));
+ max_val = std::max(max_val, t[i].shape().dim_size(j));
}
shape.AddDim(max_val);
}