← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/swig1.3/oneiric

« back to all changes in this revision

Viewing changes to Lib/python/std_multimap.i

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-06 10:27:08 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071206102708-t37t62i45n595w0e
Tags: 1.3.33-2ubuntu1
* Merge with Debian; remaining changes:
  - Drop support for pike.
  - Use python2.5 instead of python2.4.
  - Clean Runtime/ as well.
  - Force a few environment variables.
* debian/Rules (clean): Remove Lib/ocaml/swigp4.ml.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/python/std_multimap.i
22
22
      static int asptr(PyObject *obj, std::multimap<K,T> **val) {
23
23
        int res = SWIG_ERROR;
24
24
        if (PyDict_Check(obj)) {
25
 
          PyObject_var items = PyMapping_Items(obj);
 
25
          PyObject_var items = PyObject_CallMethod(obj,"items",NULL);
26
26
          return traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val);
27
27
        } else {
28
28
          multimap_type *p;