From 12018f73fcb83e985c397caedaff2652fb2f56c5 Mon Sep 17 00:00:00 2001 From: Dero Gharibian Date: Wed, 3 Apr 2019 17:02:11 -0700 Subject: [PATCH] Remove superfluous #ifdef. ::string resolves to std::string on PLATFORM_GOOGLE. PiperOrigin-RevId: 241835182 --- tensorflow/core/platform/types.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tensorflow/core/platform/types.h b/tensorflow/core/platform/types.h index a4fa790317f..b82d9cc3247 100644 --- a/tensorflow/core/platform/types.h +++ b/tensorflow/core/platform/types.h @@ -33,14 +33,8 @@ limitations under the License. namespace tensorflow { -// Define tensorflow::string to refer to appropriate platform specific type. -// TODO(josh11b): Move this into the platform/*/integral_types.h files -// above, and rename them platform/*/types.h. -#if defined(PLATFORM_GOOGLE) -using ::string; -#else +// Alias tensorflow::string to std::string. using std::string; -#endif static const uint8 kuint8max = ((uint8)0xFF); static const uint16 kuint16max = ((uint16)0xFFFF);