← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/utilscmn.cpp

  • 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:
src/common/utilscmn.cpp
774
774
#define SWAP(a, b, size)                                                      \
775
775
  do                                                                          \
776
776
    {                                                                         \
777
 
      register size_t __size = (size);                                        \
778
 
      register char *__a = (a), *__b = (b);                                   \
 
777
      size_t __size = (size);                                                 \
 
778
      char *__a = (a), *__b = (b);                                            \
779
779
      do                                                                      \
780
780
        {                                                                     \
781
781
          char __tmp = *__a;                                                  \
828
828
void wxQsort(void* pbase, size_t total_elems,
829
829
             size_t size, wxSortCallback cmp, const void* user_data)
830
830
{
831
 
  register char *base_ptr = (char *) pbase;
 
831
  char *base_ptr = (char *) pbase;
832
832
  const size_t max_thresh = MAX_THRESH * size;
833
833
 
834
834
  if (total_elems == 0)
942
942
    char *thresh = base_ptr + max_thresh;
943
943
    if ( thresh > end_ptr )
944
944
        thresh = end_ptr;
945
 
    register char *run_ptr;
 
945
    char *run_ptr;
946
946
 
947
947
    /* Find smallest element in first threshold and place it at the
948
948
       array's beginning.  This is the smallest array element,
1205
1205
            if ( ++it == in.end() )
1206
1206
            {
1207
1207
                wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str());
 
1208
                break;
1208
1209
            }
1209
1210
            else
1210
1211
            {