message: Added LOG(FATAL) for scalar<std::string>() usage when USE_TSTRING is enabled.
diff: @@ -869,12 +869,29 @@ typename TTypes<T>::Scalar Tensor::scalar() {
  return typename TTypes<T>::Scalar(base<T>());
  }
  +#ifdef USE_TSTRING
  +template <>
  +inline typename TTypes<std::string>::Scalar Tensor::scalar<std::string>() {
  + LOG(FATAL)
  + << "std::string is no longer a scalar type, use tensorflow::tstring";
  +}
  +#endif // USE_TSTRING
  +
  template <typename T>
  typename TTypes<T>::ConstScalar Tensor::scalar() const {
  CheckIsAlignedAndSingleElement();
  return typename TTypes<T>::ConstScalar(base<T>());
  }
  +#ifdef USE_TSTRING
  +template <>
  +inline typename TTypes<std::string>::ConstScalar Tensor::scalar<std::string>()
  + const {
  + LOG(FATAL)
  + << "std::string is no longer a scalar type, use tensorflow::tstring";
  +}
  +#endif // USE_TSTRING
  +
  template <typename T, size_t NDIMS>
  typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_dims() {
  return shaped<T, NDIMS>(ComputeFlatInnerDims(shape_.dim_sizes(), NDIMS));
  