From e58829821ce8cb89e5e60591836f2421e8fc8b72 Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok16@gmail.com>
Date: Thu, 4 Aug 2016 21:57:10 -0700
Subject: [PATCH] Fix prototype mismatch of ByteCount in env.cc (#3614)

* Fix prototype mismatch of ByteCount in env.cc

* Change email
---
 tensorflow/core/platform/env.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/platform/env.cc b/tensorflow/core/platform/env.cc
index 6a40a51e3f1..9a1e494c737 100644
--- a/tensorflow/core/platform/env.cc
+++ b/tensorflow/core/platform/env.cc
@@ -301,7 +301,7 @@ class FileStream : public ::tensorflow::protobuf::io::ZeroCopyInputStream {
     pos_ += count;
     return true;
   }
-  int64 ByteCount() const override { return pos_; }
+  google::protobuf::int64 ByteCount() const override { return pos_; }
   Status status() const { return status_; }
 
   bool Next(const void** data, int* size) override {