commit 96170c0207ffda88d02912e6a258eb67eacfa085
author Gunhan Gulsoy <gunan@google.com> Fri Jan 17 22:31:31 2020 -0800
committer TensorFlower Gardener <gardener@tensorflow.org> Fri Jan 17 22:34:28 2020 -0800
tree b04a2c7a85da06d9011eda5a3f18c82d5c333576
parent 2b33d5ece50d37b712520fad4311258dc84ee31c

Change enum names in dataset_test.

MSVC does not like _int32.

PiperOrigin-RevId: 290396961
Change-Id: I8d131e83d93c605d04f17e7db5c46cdfffa24dba

tensorflow/core/framework/dataset_test.cc

diff --git a/tensorflow/core/framework/dataset_test.cc b/tensorflow/core/framework/dataset_test.cc
index 6f8b5b1..b1e1237 100644
--- a/tensorflow/core/framework/dataset_test.cc
+++ b/tensorflow/core/framework/dataset_test.cc
@@ -27,7 +27,13 @@
   EXPECT_FALSE(data::DatasetOpRegistry::IsRegistered("InvalidDatasetOp"));
 }
 
-enum DataTypeTest { _int32, _int64, _float, _double, _string };
+enum DataTypeTest {
+  _tf_int_32,
+  _tf_int_64,
+  _tf_float_,
+  _tf_double_,
+  _tf_string_
+};
 
 struct DatasetTestParam {
   const DataTypeTest type;
@@ -40,7 +46,7 @@
 
 TEST_P(DatasetTestTotalBytes, TestTotalBytes) {
   const DatasetTestParam& test_case = GetParam();
-  if (test_case.type == _string) {
+  if (test_case.type == _tf_string_) {
     // TotalBytes() is approximate and gives an upper bound for strings
     EXPECT_LE(data::GetTotalBytes(test_case.tensor), test_case.expected_bytes);
   } else {
@@ -48,15 +54,16 @@
   }
 }
 
-std::vector<Tensor> tensor_int32s{test::AsTensor<int32>({1, 2, 3, 4, 5}),
-                                  test::AsTensor<int32>({1, 2, 3, 4})};
+std::vector<Tensor> tensor_tf_int_32s{test::AsTensor<int32>({1, 2, 3, 4, 5}),
+                                      test::AsTensor<int32>({1, 2, 3, 4})};
 
-std::vector<Tensor> tensor_int64s{test::AsTensor<int64>({1, 2, 3, 4, 5}),
-                                  test::AsTensor<int64>({10, 12})};
+std::vector<Tensor> tensor_tf_int_64s{test::AsTensor<int64>({1, 2, 3, 4, 5}),
+                                      test::AsTensor<int64>({10, 12})};
 
-std::vector<Tensor> tensor_floats{test::AsTensor<float>({1.0, 2.0, 3.0, 4.0})};
+std::vector<Tensor> tensor_tf_float_s{
+    test::AsTensor<float>({1.0, 2.0, 3.0, 4.0})};
 
-std::vector<Tensor> tensor_doubles{
+std::vector<Tensor> tensor_tf_double_s{
     test::AsTensor<double>({100.0}), test::AsTensor<double>({200.0}),
     test::AsTensor<double>({400.0}), test::AsTensor<double>({800.0})};
 
@@ -64,11 +71,11 @@
 std::vector<Tensor> tensor_strs{test::AsTensor<tstring>({str})};
 
 const DatasetTestParam test_cases[] = {
-    {_int32, tensor_int32s, 4 /*bytes*/ * 9 /*elements*/},
-    {_int64, tensor_int64s, 8 /*bytes*/ * 7 /*elements*/},
-    {_float, tensor_floats, 4 /*bytes*/ * 4 /*elements*/},
-    {_double, tensor_doubles, 8 /*bytes*/ * 4 /*elements*/},
-    {_string, tensor_strs,
+    {_tf_int_32, tensor_tf_int_32s, 4 /*bytes*/ * 9 /*elements*/},
+    {_tf_int_64, tensor_tf_int_64s, 8 /*bytes*/ * 7 /*elements*/},
+    {_tf_float_, tensor_tf_float_s, 4 /*bytes*/ * 4 /*elements*/},
+    {_tf_double_, tensor_tf_double_s, 8 /*bytes*/ * 4 /*elements*/},
+    {_tf_string_, tensor_strs,
      static_cast<int64>(sizeof(str) + str.size()) /*bytes*/},
 };