Fix MSVC warnings related to data type macros

PiperOrigin-RevId: 562991858 Change-Id: I53cefe9cae4913d66035286262f0b9380aa1deb9
google · Sep 6, 2023 · c01efdc · c01efdc
1 parent 2fc1698
commit c01efdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/tensorstore/data_type.cc b/tensorstore/data_type.cc
@@ -290,7 +290,7 @@ struct NumericUstringConvertDataType {
 
 }  // namespace internal_data_type
 
-#define TENSORSTORE_INTERNAL_CONVERT_INT(T)                          \
+#define TENSORSTORE_INTERNAL_CONVERT_INT(T, ...)                     \
   template <>                                                        \
   struct ConvertDataType<::tensorstore::dtypes::T,                   \
                          ::tensorstore::dtypes::string_t>            \
@@ -305,7 +305,7 @@ struct NumericUstringConvertDataType {
       : public internal_data_type::JsonIntegerConvertDataType {};    \
   /**/
 
-#define TENSORSTORE_INTERNAL_CONVERT_FLOAT(T)                        \
+#define TENSORSTORE_INTERNAL_CONVERT_FLOAT(T, ...)                   \
   template <>                                                        \
   struct ConvertDataType<::tensorstore::dtypes::T,                   \
                          ::tensorstore::dtypes::string_t>            \

diff --git a/tensorstore/data_type_conversion_test.cc b/tensorstore/data_type_conversion_test.cc
@@ -49,7 +49,7 @@ using ::tensorstore::internal::GetElementCopyErrorStatus;
 using ::tensorstore::internal::IterationBufferKind;
 using ::tensorstore::internal::IterationBufferPointer;
 
-#define X(T)                      \
+#define X(T, ...)                 \
   using ::tensorstore::dtypes::T; \
   /**/
 TENSORSTORE_FOR_EACH_DATA_TYPE(X)

diff --git a/tensorstore/data_type_test.cc b/tensorstore/data_type_test.cc
@@ -54,7 +54,7 @@ using ::tensorstore::internal::IterationBufferPointer;
 using ::tensorstore::serialization::SerializationRoundTrip;
 using ::tensorstore::serialization::TestSerializationRoundTrip;
 
-#define X(T)                                                \
+#define X(T, ...)                                           \
   using ::tensorstore::dtypes::T;                           \
   static_assert(static_cast<int>(DataTypeId::T) >= 0 &&     \
                 static_cast<int>(DataTypeId::T) <           \
@@ -90,7 +90,7 @@ static_assert(IsElementType<int (ClassT::*)(int)>);
 
 TEST(ElementOperationsTest, DataTypeIdOrder) {
   int i = 0;
-#define X(T) EXPECT_EQ(i++, static_cast<int>(DataTypeId::T));
+#define X(T, ...) EXPECT_EQ(i++, static_cast<int>(DataTypeId::T));
   TENSORSTORE_FOR_EACH_DATA_TYPE(X)
 #undef X
 }