comparison oct-py-eval.h @ 403:3644df6564bc

maint: use C++11 nullptr rather than 0 or NULL * __py_struct_from_dict__.cc, oct-py-eval.cc, oct-py-eval.h, oct-py-object.h, oct-py-types.cc, oct-py-util.cc, pycall.cc, pyeval.cc, pyexec.cc: Use C++11 nullptr rather than 0 or NULL.
author Mike Miller <mtmiller@octave.org>
date Fri, 28 Apr 2017 14:19:49 -0700
parents c4b78e449c62
children
comparison
equal deleted inserted replaced
402:c4b78e449c62 403:3644df6564bc
54 //! @param args tuple of positional arguments 54 //! @param args tuple of positional arguments
55 //! @param kwargs dictionary of keyword arguments 55 //! @param kwargs dictionary of keyword arguments
56 //! @return return value of @a func 56 //! @return return value of @a func
57 PyObject * 57 PyObject *
58 py_call_function (const std::string& func, PyObject *args, 58 py_call_function (const std::string& func, PyObject *args,
59 PyObject *kwargs = 0); 59 PyObject *kwargs = nullptr);
60 60
61 //! Call a Python function with the given argument list. 61 //! Call a Python function with the given argument list.
62 //! 62 //!
63 //! If @a args contains one or more values created by the @c pyargs function, 63 //! If @a args contains one or more values created by the @c pyargs function,
64 //! they are automatically interpreted as keyword arguments. 64 //! they are automatically interpreted as keyword arguments.
74 //! @param callable Python function or other callable object 74 //! @param callable Python function or other callable object
75 //! @param args tuple of positional arguments 75 //! @param args tuple of positional arguments
76 //! @param kwargs dictionary of keyword arguments 76 //! @param kwargs dictionary of keyword arguments
77 //! @return return value of @a func 77 //! @return return value of @a func
78 PyObject * 78 PyObject *
79 py_call_function (PyObject *callable, PyObject *args, PyObject *kwargs = 0); 79 py_call_function (PyObject *callable, PyObject *args,
80 PyObject *kwargs = nullptr);
80 81
81 PyObject * 82 PyObject *
82 py_eval_string (const std::string& expr, PyObject *globals = 0, 83 py_eval_string (const std::string& expr, PyObject *globals = nullptr,
83 PyObject *locals = 0); 84 PyObject *locals = nullptr);
84 85
85 PyObject * 86 PyObject *
86 py_exec_string (const std::string& expr, PyObject *globals = 0, 87 py_exec_string (const std::string& expr, PyObject *globals = nullptr,
87 PyObject *locals = 0); 88 PyObject *locals = nullptr);
88 89
89 } 90 }
90 91
91 #endif 92 #endif