Automated Code Change

PiperOrigin-RevId: 595127112
protocolbuffers · Jan 4, 2024 · 46d356d · 46d356d
1 parent b7a8a02
commit 46d356d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc
@@ -532,10 +532,10 @@ bool CheckAndGetInteger(PyObject* arg, T* value) {
 
 // These are referenced by repeated_scalar_container, and must
 // be explicitly instantiated.
-template bool CheckAndGetInteger<int32>(PyObject*, int32*);
-template bool CheckAndGetInteger<int64>(PyObject*, int64*);
-template bool CheckAndGetInteger<uint32>(PyObject*, uint32*);
-template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
+template bool CheckAndGetInteger<int32_t>(PyObject*, int32_t*);
+template bool CheckAndGetInteger<int64_t>(PyObject*, int64_t*);
+template bool CheckAndGetInteger<uint32_t>(PyObject*, uint32_t*);
+template bool CheckAndGetInteger<uint64_t>(PyObject*, uint64_t*);
 
 bool CheckAndGetDouble(PyObject* arg, double* value) {
   *value = PyFloat_AsDouble(arg);

diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h
@@ -19,8 +19,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "google/protobuf/stubs/common.h"
-
 namespace google {
 namespace protobuf {
 
@@ -342,10 +340,10 @@ bool InitProto2MessageModule(PyObject *m);
 
 // These are referenced by repeated_scalar_container, and must
 // be explicitly instantiated.
-extern template bool CheckAndGetInteger<int32>(PyObject*, int32*);
-extern template bool CheckAndGetInteger<int64>(PyObject*, int64*);
-extern template bool CheckAndGetInteger<uint32>(PyObject*, uint32*);
-extern template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
+extern template bool CheckAndGetInteger<int32_t>(PyObject*, int32_t*);
+extern template bool CheckAndGetInteger<int64_t>(PyObject*, int64_t*);
+extern template bool CheckAndGetInteger<uint32_t>(PyObject*, uint32_t*);
+extern template bool CheckAndGetInteger<uint64_t>(PyObject*, uint64_t*);
 
 }  // namespace python
 }  // namespace protobuf