← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to include/wx/msw/ole/safearray.h

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/wx/msw/ole/safearray.h
267
267
 
268
268
        internT* data;
269
269
 
270
 
        if ( FAILED( SafeArrayPtrOfIndex(m_array, indices, (void**)&data) ) )
 
270
        if ( FAILED( SafeArrayPtrOfIndex(m_array, (LONG *)indices, (void**)&data) ) )
271
271
            return false;
272
272
 
273
273
        return Convertor::ToArray(element, *data);
284
284
 
285
285
        internT* data;
286
286
 
287
 
        if ( FAILED( SafeArrayPtrOfIndex(m_array, indices, (void**)&data) ) )
 
287
        if ( FAILED( SafeArrayPtrOfIndex(m_array, (LONG *)indices, (void**)&data) ) )
288
288
            return false;
289
289
 
290
290
        return Convertor::FromArray(*data, element);