pyext: missing cast to constant char* (#5713)

We need to cast to a constant charpointer here.

pyext: missing cast to constant char* (#5713)
We need to cast to a constant charpointer here.
3a538fc9 · grindhold · Jie Luo · 89b914f8 · 3a538fc9
Commit 3a538fc9 authored Feb 26, 2019 by grindhold Committed by Jie Luo Feb 26, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

message_factory.cc python/google/protobuf/pyext/message_factory.cc +5 -3

No files found.
--- a/python/google/protobuf/pyext/message_factory.cc
+++ b/python/google/protobuf/pyext/message_factory.cc
@@ -43,9 +43,11 @@
    #error "Python 3.0 - 3.2 are not supported."
  #endif
  #define PyString_AsStringAndSize(ob, charpp, sizep) \
-    (PyUnicode_Check(ob)? \
-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
-       PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+    (PyUnicode_Check(ob) ? ((*(charpp) = const_cast<char*>(                   \
+                               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL \
+                              ? -1                                            \
+                              : 0)                                            \
+                        : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
 #endif

 namespace google {