Changeset 21178 in vbox

Timestamp:

Jul 2, 2009 4:13:44 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49475

Message:

xpcom/python: fixed some annoying gcc warnings

Location:

trunk/src/libs/xpcom18a4/python/src

Files:

• PyGBase.cpp (modified) (4 diffs)
• PyGStub.cpp (modified) (2 diffs)
• dllmain.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/python/src/PyGBase.cpp

@@ -62 +62 @@
 extern PyG_Base *MakePyG_nsIInputStream(PyObject *instance);
 
-static char *PyXPCOM_szDefaultGatewayAttributeName = "_com_instance_default_gateway_";
+static char *PyXPCOM_szDefaultGatewayAttributeName = (char*)"_com_instance_default_gateway_";
 PyG_Base *GetDefaultGateway(PyObject *instance);
 void AddDefaultGateway(PyObject *instance, nsISupports *gateway);
@@ -302 +302 @@
 
         result = PyObject_CallMethod(m_pPyObject, 
-                                       "_MakeInterfaceParam_",
-                                       "OOiOi",
+                                       (char*)"_MakeInterfaceParam_",
+                                       (char*)"OOiOi",
                                        obISupports,
                                        obIID,
@@ -372 +372 @@
                 }
 
-                PyObject *result = PyObject_CallMethod(m_pPyObject, "_QueryInterface_",
-                                                                    "OO", 
+                PyObject *result = PyObject_CallMethod(m_pPyObject, (char*)"_QueryInterface_",
+                                                                    (char*)"OO", 
                                                                     this_interface_ob, ob);
                 Py_DECREF(ob);
@@ -481 +481 @@
 
                 PyObject *err_result = PyObject_CallMethod(m_pPyObject, 
-                                               "_GatewayException_",
-                                               "z(OOO)",
+                                               (char*)"_GatewayException_",
+                                               (char*)"z(OOO)",
                                                szMethodName,
                                                exc_typ ? exc_typ : Py_None, // should never be NULL, but defensive programming...

trunk/src/libs/xpcom18a4/python/src/PyGStub.cpp

@@ -103 +103 @@
                 goto done;
         result = PyObject_CallMethod(m_pPyObject, 
-                                               "_CallMethod_",
-                                               "OiOO",
+                                               (char*)"_CallMethod_",
+                                               (char*)"OiOO",
                                                obThisObject,
                                                (int)methodIndex,
@@ -138 +138 @@
 
                 PyObject *err_result = PyObject_CallMethod(m_pPyObject, 
-                                               "_CallMethodException_",
-                                               "OiOO(OOO)",
+                                               (char*)"_CallMethodException_",
+                                               (char*)"OiOO(OOO)",
                                                obThisObject,
                                                (int)methodIndex,

trunk/src/libs/xpcom18a4/python/src/dllmain.cpp

@@ -202 +202 @@
                         PyXPCOM_Globals_Ensure();
                         // Make sure we have _something_ as sys.argv.
-                        if (PySys_GetObject("argv")==NULL) {
+                        if (PySys_GetObject((char*)"argv")==NULL) {
                                 PyObject *path = PyList_New(0);
                                 PyObject *str = PyString_FromString("");
                                 PyList_Append(path, str);
-                                PySys_SetObject("argv", path);
+                                PySys_SetObject((char*)"argv", path);
                                 Py_XDECREF(path);
                                 Py_XDECREF(str);