diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-29 16:31:33 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:55 -0300 |
| commit | 78d5b68b37b206c81932f188e106b7f239b25cab (patch) | |
| tree | 4848ac1a5282e60160dd0ed396afb8de34368960 /tests | |
| parent | 2fb33ff364de0d134d3af9eb3d7a0a2fcf9e4877 (diff) | |
Fix injectcode test to work with the newer version of sequencetoArgcArgv.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libsample/injectcode.cpp | 2 | ||||
| -rw-r--r-- | tests/samplebinding/typesystem_sample.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/libsample/injectcode.cpp b/tests/libsample/injectcode.cpp index 05c4a1438..6e19de750 100644 --- a/tests/libsample/injectcode.cpp +++ b/tests/libsample/injectcode.cpp @@ -54,7 +54,7 @@ const char* InjectCode::simpleMethod2() const char* InjectCode::simpleMethod3(int argc, char** argv) { - for (int i = 0; i < argc; ++i) + for (int i = 1; i < argc; ++i) m_valueHolder += argv[i]; return m_valueHolder.c_str(); } diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 60e7e22ca..ff367f4ce 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -914,7 +914,7 @@ <inject-code class="target" position="beginning"> int argc; char** argv; - if (!PySequenceToArgcArgv(%PYARG_1, &argc, &argv)) { + if (!sequenceToArgcArgv(%PYARG_1, &argc, &argv)) { PyErr_SetString(PyExc_TypeError, "error"); return 0; } @@ -922,7 +922,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](foo); for (int i = 0; i < argc; ++i) - delete[] argv[i]; + free(argv[i]); delete[] argv; </inject-code> </modify-function> @@ -938,7 +938,7 @@ <inject-code class="target" position="beginning"> int argc; char** argv; - if (!PySequenceToArgcArgv(%PYARG_1, &argc, &argv)) { + if (!sequenceToArgcArgv(%PYARG_1, &argc, &argv)) { PyErr_SetString(PyExc_TypeError, "error"); return 0; } @@ -946,7 +946,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](foo); for (int i = 0; i < argc; ++i) - delete[] argv[i]; + free(argv[i]); delete[] argv; </inject-code> </modify-function> |