diff options
| author |  Anna R <annarev@google.com> | 2018-07-03 19:00:14 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-03 19:03:14 -0700 |
| commit | 1e7dde8791c535bd09bda9f9ecbe8594aed4f4c6 (patch) | |
| tree | 9a0305637bb732e4d9554ac1ceca38f9c91db2fb /tensorflow/core/graph | |
| parent | 58a61c0a09a9dffbf9d2946d8bacd2adce446f26 (diff) | |
I think this should fix the following failure with see in MacOS build:
error: no type named 'type' in 'std::__1::enable_if<false, void>'; 'enable_if' cannot be used to disable this declaration
,typename enable_if<is_convertible<const _U1&, _T1>::value &&
PiperOrigin-RevId: 203216967
Diffstat (limited to 'tensorflow/core/graph')
| -rw-r--r-- | tensorflow/core/graph/tensor_id.cc | 3 | ||||
| -rw-r--r-- | tensorflow/core/graph/tensor_id.h | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tensorflow/core/graph/tensor_id.cc b/tensorflow/core/graph/tensor_id.cc index b5c2c2aac8..80c76df255 100644 --- a/tensorflow/core/graph/tensor_id.cc +++ b/tensorflow/core/graph/tensor_id.cc @@ -24,9 +24,6 @@ namespace tensorflow { TensorId::TensorId(const SafeTensorId& id) : TensorId(id.first, id.second) {} -SafeTensorId::SafeTensorId(StringPiece str, int idx) - : SafeTensorId(str.ToString(), idx) {} - SafeTensorId::SafeTensorId(const TensorId& id) : SafeTensorId(id.first.ToString(), id.second) {} diff --git a/tensorflow/core/graph/tensor_id.h b/tensorflow/core/graph/tensor_id.h index b0978b4120..0ba3942618 100644 --- a/tensorflow/core/graph/tensor_id.h +++ b/tensorflow/core/graph/tensor_id.h @@ -62,13 +62,10 @@ TensorId ParseTensorName(StringPiece name); struct SafeTensorId : public std::pair<string, int> { typedef std::pair<string, int> Base; - // Inherit the set of constructors. - using Base::pair; - // NOTE(skyewm): this is required on some platforms. I'm not sure why the - // using statement above isn't always sufficient. + // using "using Base::pair;" isn't always sufficient. SafeTensorId() : Base() {} - SafeTensorId(StringPiece str, int idx); + SafeTensorId(const string& str, int idx) : Base(str, idx) {} SafeTensorId(const TensorId& id); string ToString() const { |