aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Derek Murray <mrry@google.com>2018-03-23 10:12:05 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-03-25 02:28:40 -0700
commit1b732d528ba120a6da32100f9991a353128114e8 (patch)
tree623072e8f0348166acdda34aca02e237826ab1c2
parente5456bbd0ac1d80f0dae4e54407a5001e0fbfba6 (diff)
Silence compilation warning in allocator.h
Some builds report the following warning (even though LOG(FATAL) is terminal): ``` ./tensorflow/core/framework/device_base.h(188): warning: missing return statement at end of non-void function "tensorflow::DeviceBase::GetScopedAllocator" ``` PiperOrigin-RevId: 190235863
-rw-r--r--tensorflow/core/framework/device_base.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tensorflow/core/framework/device_base.h b/tensorflow/core/framework/device_base.h
index 52b9077d8c..8473b228d3 100644
--- a/tensorflow/core/framework/device_base.h
+++ b/tensorflow/core/framework/device_base.h
@@ -185,6 +185,7 @@ class DeviceBase {
virtual Allocator* GetScopedAllocator(AllocatorAttributes attr,
int64 step_id) {
LOG(FATAL) << "Device does not implement GetScopedAllocator()";
+ return nullptr;
}
virtual ScopedAllocatorMgr* GetScopedAllocatorMgr() const { return nullptr; }