← Back to branch summary

~ubuntu-branches/ubuntu/quantal/swig2.0/quantal

« back to all changes in this revision

Viewing changes to Source/Modules/tcl8.cxx

  • Committer: Package Import Robot
  • Author(s): Stefano Rivera
  • Date: 2012-06-01 17:05:17 UTC
  • mfrom: (1.1.6) (10.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20120601170517-q0ik32ij61i4r6f0
Tags: 2.0.7-2ubuntu1
https://launchpad.net/bugs/1006387
* Merge from Debian unstable (LP: #1006387). Remaining changes:
  - Drop libchicken-dev from the build-depends (in universe).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/Modules/tcl8.cxx
11
11
 * Tcl8 language module for SWIG.
12
12
 * ----------------------------------------------------------------------------- */
13
13
 
14
 
char cvsroot_tcl8_cxx[] = "$Id: tcl8.cxx 12655 2011-05-05 06:23:02Z wsfulton $";
 
14
char cvsroot_tcl8_cxx[] = "$Id: tcl8.cxx 12830 2011-10-30 21:51:50Z wsfulton $";
15
15
 
16
16
#include "swigmod.h"
17
17
#include "cparse.h"
460
460
    /* Need to redo all of this code (eventually) */
461
461
 
462
462
    /* Return value if necessary  */
463
 
    if ((tm = Swig_typemap_lookup_out("out", n, "result", f, actioncode))) {
464
 
      Replaceall(tm, "$source", "result");
 
463
    if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) {
 
464
      Replaceall(tm, "$source", Swig_cresult_name());
465
465
#ifdef SWIG_USE_RESULTOBJ
466
466
      Replaceall(tm, "$target", "resultobj");
467
467
      Replaceall(tm, "$result", "resultobj");
488
488
 
489
489
    /* Look for any remaining cleanup */
490
490
    if (GetFlag(n, "feature:new")) {
491
 
      if ((tm = Swig_typemap_lookup("newfree", n, "result", 0))) {
492
 
        Replaceall(tm, "$source", "result");
 
491
      if ((tm = Swig_typemap_lookup("newfree", n, Swig_cresult_name(), 0))) {
 
492
        Replaceall(tm, "$source", Swig_cresult_name());
493
493
        Printf(f->code, "%s\n", tm);
494
494
      }
495
495
    }
496
496
 
497
 
    if ((tm = Swig_typemap_lookup("ret", n, "result", 0))) {
498
 
      Replaceall(tm, "$source", "result");
 
497
    if ((tm = Swig_typemap_lookup("ret", n, Swig_cresult_name(), 0))) {
 
498
      Replaceall(tm, "$source", Swig_cresult_name());
499
499
      Printf(f->code, "%s\n", tm);
500
500
    }
501
501
#ifdef SWIG_USE_RESULTOBJ