← Back to branch summary

~ubuntu-branches/ubuntu/raring/glibmm2.4/raring

« back to all changes in this revision

Viewing changes to gio/giomm/converter.cc

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-03-06 13:03:41 UTC
  • mfrom: (1.2.79)
  • Revision ID: package-import@ubuntu.com-20130306130341-02m9gb1ahbdcgbn5
Tags: 2.35.8-0ubuntu1
New upstream release based on GLib 2.35.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
gio/giomm/converter.cc
138
138
  // Call the original underlying C function:
139
139
  if(base && base->convert)
140
140
  {
141
 
    GConverterResult result = (*base->convert)(self, inbuf, inbuf_size, outbuf, outbuf_size, flags, bytes_read, bytes_written, error);
 
141
    GConverterResult retval = (*base->convert)(self, inbuf, inbuf_size, outbuf, outbuf_size, flags, bytes_read, bytes_written, error);
142
142
    if(*error)
143
143
      ::Glib::Error::throw_exception(*error);
144
 
    return result;
 
144
    return retval;
145
145
  }
146
146
 
147
147
 
265
265
  if(base && base->convert)
266
266
  {
267
267
    GError* gerror = 0;
268
 
    ConverterResult result(((ConverterResult)((*base->convert)(gobj(),inbuf,inbuf_size,outbuf,outbuf_size,((GConverterFlags)(flags)),&(bytes_read),&(bytes_written),&(gerror)))));
 
268
    ConverterResult retval(((ConverterResult)((*base->convert)(gobj(),inbuf,inbuf_size,outbuf,outbuf_size,((GConverterFlags)(flags)),&(bytes_read),&(bytes_written),&(gerror)))));
269
269
    if(gerror)
270
270
      ::Glib::Error::throw_exception(gerror);
271
 
    return result;
 
271
    return retval;
272
272
  }
273
273
 
274
274
  typedef ConverterResult RType;