merge

27 files changed, 3558 insertions, 73 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f1e0d0666..10e914178 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		63
+PKG_RELEASE:=		64
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index f2b7125b8..a478abecd 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -1,19 +1,4 @@
 #!/bin/sh
-if [ "$SUBSYSTEM" == "firmware" ];then
-        logger "Firmware load for $FIRMWARE requested"
-        if [ "$ACTION" == "add" ];then
-                if [ -e "/lib/firmware/$FIRMWARE" ];then
-                        logger "Firmware loading ..."
-                        echo 1 > /sys$DEVPATH/loading
-                        cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
-                        echo 0 > /sys$DEVPATH/loading
-                        logger "finished."
-                else
-                        logger "Firmware file $FIRMWARE not found"
-                        echo -1 > /sys$DEVPATH/loading
-                fi
-        fi
-fi
 if [ "$SUBSYSTEM" == "pcmcia_socket" ];then
 	logger "Setting up PCMCIA socket resource database"
 	if [ "$ACTION" == "add" ];then
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 0cde4bca5..1d50365e3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.21.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 74069af13..e350a1b16 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -1017,7 +1017,7 @@ source package/busybox/config/networking/udhcp/Config.in
 
 config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string "ifup udhcpc command line options"
-	default "-R -n"
+	default "-R -b"
 	depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
 	help
 	  Command line options to pass to udhcpc from ifup.
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index baf6beb26..aafc795b1 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -69,6 +69,7 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
 	  These devices will request userspace look up the files in
 	  /lib/firmware/ and if it exists, send it to the kernel for
 	  loading into the hardware.
+
 config BUSYBOX_REV
 	bool "rev"
 	default n
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 4d83cf472..f67813494 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -15,6 +15,7 @@ PKG_URL:=		http://www.cups.org/
 PKG_SITES:=		http://www.cups.org/software/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
@@ -32,6 +33,7 @@ HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--disable-webif \
 			--disable-gssapi \
+			--disable-avahi \
 			--disable-pam \
 			--disable-dbus \
 			--without-java \
@@ -46,10 +48,12 @@ HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--with-components=core \
 			--with-rcdir=$(STAGING_HOST_DIR)/etc
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
-			OPTIM='-fPIC'
+			OPTIM='-fPIC -std=c89'
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \
+			--disable-static \
+			--disable-avahi \
 			--disable-webif \
 			--disable-tcp-wrappers \
 			--disable-gssapi \
@@ -68,11 +72,6 @@ CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-rcdir=$(STAGING_TARGET_DIR)/etc
 
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
-XAKE_FLAGS+=		OPTIM='-fPIC -fstack-protector'
-else
-XAKE_FLAGS+=		OPTIM='-fPIC'
-endif
 
 cups-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib
diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in
new file mode 100644
index 000000000..1a8f91894
--- /dev/null
+++ b/package/cups/patches/patch-Makedefs_in
@@ -0,0 +1,10 @@
+--- cups-1.7.1.orig/Makedefs.in	2013-07-17 17:21:18.000000000 +0200
++++ cups-1.7.1/Makedefs.in	2014-01-31 08:40:55.000000000 +0100
+@@ -238,7 +238,6 @@ DBUSDIR		=	@DBUSDIR@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index 19c9f6092..3a4974140 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,11 +1,14 @@
 --- cups-1.7.1.orig/configure	2014-01-08 17:26:27.000000000 +0100
-+++ cups-1.7.1/configure	2014-01-24 18:05:03.000000000 +0100
-@@ -5792,7 +5792,7 @@ fi
++++ cups-1.7.1/configure	2014-01-31 16:48:50.000000000 +0100
+@@ -2490,9 +2490,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
- case "$COMPONENTS" in
- 	all)
--		BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
-+		BUILDDIRS="filter backend berkeley monitor notifier ppdc conf data"
- 		;;
  
- 	core)
+ 
+-uname=`uname`
+-uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'`
+-uarch=`uname -m`
++uname=Linux
++uversion=3.0
+ 
+ case "$uname" in
+ 	Darwin*)
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 054541334..e4b69591d 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -30,6 +30,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 WRKDIST=		${WRKDIR}/mozilla-release
 
 include $(TOPDIR)/mk/package.mk
+include $(TOPDIR)/mk/python.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -41,6 +42,7 @@ endif
 
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
+			PYTHON="$(PYTHON)" \
 			HOST_CC="${CC_FOR_BUILD}" \
 			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
 			HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \
diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
index bf6c335de..3a79329a3 100644
--- a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
+++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c
@@ -1,6 +1,6 @@
 --- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-01-03 13:06:22.000000000 +0100
-@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id:
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-02-05 07:19:01.000000000 +0100
+@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id: 
  #undef __unused
  #include <linux/sysctl.h>
  #endif
@@ -10,7 +10,7 @@
  #ifndef LINUX
  #if !defined(__OpenBSD__) && !defined(__NetBSD__)
  #include <net/if_var.h>
-@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id:
+@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id: 
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py b/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py
new file mode 100644
index 000000000..60d33bb2e
--- /dev/null
+++ b/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py
@@ -0,0 +1,23 @@
+--- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2014-02-05 08:12:49.000000000 +0100
+@@ -364,20 +364,6 @@ def WriteOnDiff(filename):
+ 
+ def GetFlavor(params):
+   """Returns |params.flavor| if it's set, the system's default flavor else."""
+-  flavors = {
+-    'cygwin': 'win',
+-    'win32': 'win',
+-    'darwin': 'mac',
+-  }
+-
+-  if 'flavor' in params:
+-    return params['flavor']
+-  if sys.platform in flavors:
+-    return flavors[sys.platform]
+-  if sys.platform.startswith('sunos'):
+-    return 'solaris'
+-  if sys.platform.startswith('freebsd'):
+-    return 'freebsd'
+ 
+   return 'linux'
+ 
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py b/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py
new file mode 100644
index 000000000..452d380f0
--- /dev/null
+++ b/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py
@@ -0,0 +1,26 @@
+--- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2014-02-05 08:13:30.000000000 +0100
+@@ -118,23 +118,6 @@ def ensure_directory_exists(path):
+ 
+ def GetFlavor(params):
+   """Returns |params.flavor| if it's set, the system's default flavor else."""
+-  system = platform.system().lower()
+-  flavors = {
+-    'microsoft': 'win',
+-    'windows'  : 'win',
+-    'cygwin'   : 'win',
+-    'darwin'   : 'mac',
+-    'sunos'    : 'solaris',
+-    'dragonfly': 'dragonfly',
+-    'freebsd'  : 'freebsd',
+-    'netbsd'   : 'netbsd',
+-    'openbsd'  : 'openbsd',
+-  }
+-
+-  if 'flavor' in params:
+-    return params['flavor']
+-  if system in flavors:
+-    return flavors[system]
+ 
+   return 'linux'
+ 
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
index 3ee2e0fdc..809dff52a 100644
--- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc
@@ -1,6 +1,6 @@
 --- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-12-05 17:07:50.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-01-02 14:58:37.000000000 +0100
-@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-02-05 07:19:01.000000000 +0100
+@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores() 
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
  
@@ -12,7 +12,7 @@
  #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
      int name[] = {
        CTL_HW,
-@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
+@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores() 
                     "Failed to get number of cores");
        number_of_cores_ = 1;
      }
diff --git a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
index ac1d23267..95cfd56ba 100644
--- a/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
+++ b/package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp
@@ -1,14 +1,3385 @@
 --- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-12-05 17:07:50.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-01-02 14:53:44.000000000 +0100
-@@ -21,6 +21,11 @@ Scott McMurray
- #include <vector>

- #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"

- 

-+#include <features.h>

-+#if defined(__UCLIBC__)

-+#undef getchar

-+#endif

-+

- namespace boost {

-   namespace detail {

-   	//This only works on unsigned data types

++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-02-05 09:52:11.000000000 +0100
+@@ -1,1688 +1,1694 @@
+-//Templated spread_sort library

+-

+-//          Copyright Steven J. Ross 2001 - 2009.

+-// Distributed under the Boost Software License, Version 1.0.

+-//    (See accompanying file LICENSE_1_0.txt or copy at

+-//          http://www.boost.org/LICENSE_1_0.txt)

+-

+-//  See http://www.boost.org/ for updates, documentation, and revision history.

+-		  

+-/*

+-Some improvements suggested by:

+-Phil Endecott and Frank Gennari

+-Cygwin fix provided by:

+-Scott McMurray

+-*/

+-

+-#ifndef BOOST_SPREAD_SORT_H

+-#define BOOST_SPREAD_SORT_H

+-#include <algorithm>

+-#include <cstring>

+-#include <vector>

+-#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"

+-

+-namespace boost {

+-  namespace detail {

+-  	//This only works on unsigned data types

+-  	template <typename T>

+-  	inline unsigned 

+-  	rough_log_2_size(const T& input) 

+-  	{

+-  		unsigned result = 0;

+-  		//The && is necessary on some compilers to avoid infinite loops; it doesn't significantly impair performance

+-  		while((input >> result) && (result < (8*sizeof(T)))) ++result;

+-  		return result;

+-  	}

+-

+-  	//Gets the maximum size which we'll call spread_sort on to control worst-case performance

+-  	//Maintains both a minimum size to recurse and a check of distribution size versus count

+-  	//This is called for a set of bins, instead of bin-by-bin, to avoid performance overhead

+-  	inline size_t

+-  	get_max_count(unsigned log_range, size_t count)

+-  	{

+-  		unsigned divisor = rough_log_2_size(count);

+-  		//Making sure the divisor is positive

+-  		if(divisor > LOG_MEAN_BIN_SIZE)

+-  			divisor -= LOG_MEAN_BIN_SIZE;

+-  		else

+-  			divisor = 1;

+-  		unsigned relative_width = (LOG_CONST * log_range)/((divisor > MAX_SPLITS) ? MAX_SPLITS : divisor);

+-  		//Don't try to bitshift more than the size of an element

+-  		if((8*sizeof(size_t)) <= relative_width)

+-  			relative_width = (8*sizeof(size_t)) - 1;

+-  		return (size_t)1 << ((relative_width < (LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT)) ? 

+-  			(LOG_MEAN_BIN_SIZE + LOG_MIN_SPLIT_COUNT) :  relative_width);

+-  	}

+-

+-  	//Find the minimum and maximum using <

+-  	template <class RandomAccessIter>

+-  	inline void 

+-  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min)

+-  	{

+-  		min = max = current;

+-  		//Start from the second item, as max and min are initialized to the first

+-  		while(++current < last) {

+-  			if(*max < *current)

+-  				max = current;

+-  			else if(*current < *min)

+-  				min = current;

+-  		}

+-  	}

+-

+-  	//Uses a user-defined comparison operator to find minimum and maximum

+-  	template <class RandomAccessIter, class compare>

+-  	inline void 

+-  	find_extremes(RandomAccessIter current, RandomAccessIter last, RandomAccessIter & max, RandomAccessIter & min, compare comp)

+-  	{

+-  		min = max = current;

+-  		while(++current < last) {

+-  			if(comp(*max, *current))

+-  				max = current;

+-  			else if(comp(*current, *min))

+-  				min = current;

+-  		}

+-  	}

+-

+-  	//Gets a non-negative right bit shift to operate as a logarithmic divisor

+-  	inline int

+-  	get_log_divisor(size_t count, unsigned log_range)

+-  	{

+-  		int log_divisor;

+-  		//If we can finish in one iteration without exceeding either (2 to the MAX_SPLITS) or n bins, do so

+-  		if((log_divisor = log_range - rough_log_2_size(count)) <= 0 && log_range < MAX_SPLITS)

+-  			log_divisor = 0;

+-  		else {

+-  			//otherwise divide the data into an optimized number of pieces

+-  			log_divisor += LOG_MEAN_BIN_SIZE;

+-  			if(log_divisor < 0)

+-  				log_divisor = 0;

+-  			//Cannot exceed MAX_SPLITS or cache misses slow down bin lookups dramatically

+-  			if((log_range - log_divisor) > MAX_SPLITS)

+-  				log_divisor = log_range - MAX_SPLITS;

+-  		}

+-  		return log_divisor;

+-  	}

+-

+-  	template <class RandomAccessIter>

+-  	inline RandomAccessIter * 

+-  	size_bins(std::vector<size_t> &bin_sizes, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset, unsigned &cache_end, unsigned bin_count)

+-  	{

+-  		//Assure space for the size of each bin, followed by initializing sizes

+-  		if(bin_count > bin_sizes.size())

+-  			bin_sizes.resize(bin_count);

+-  		for(size_t u = 0; u < bin_count; u++)

+-  			bin_sizes[u] = 0;

+-  		//Make sure there is space for the bins

+-  		cache_end = cache_offset + bin_count;

+-  		if(cache_end > bin_cache.size())

+-  			bin_cache.resize(cache_end);

+-  		return &(bin_cache[cache_offset]);

+-  	}

+-

+-  	//Implementation for recursive integer sorting

+-  	template <class RandomAccessIter, class div_type, class data_type>

+-  	inline void 

+-  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset

+-  				  , std::vector<size_t> &bin_sizes)

+-  	{

+-  		//This step is roughly 10% of runtime, but it helps avoid worst-case behavior and improve behavior with real data

+-  		//If you know the maximum and minimum ahead of time, you can pass those values in and skip this step for the first iteration

+-  		RandomAccessIter max, min;

+-  		find_extremes(first, last, max, min);

+-  		//max and min will be the same (the first item) iff all values are equivalent

+-  		if(max == min)

+-  			return;

+-  		RandomAccessIter * target_bin;

+-  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(*max >> 0) - (*min >> 0)));

+-  		div_type div_min = *min >> log_divisor;

+-  		div_type div_max = *max >> log_divisor;

+-  		unsigned bin_count = div_max - div_min + 1;

+-  		unsigned cache_end;

+-  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);

+-  	

+-  		//Calculating the size of each bin; this takes roughly 10% of runtime

+-  		for (RandomAccessIter current = first; current != last;)

+-  			bin_sizes[(*(current++) >> log_divisor) - div_min]++;

+-  		//Assign the bin positions

+-  		bins[0] = first;

+-  		for(unsigned u = 0; u < bin_count - 1; u++)

+-  			bins[u + 1] = bins[u] + bin_sizes[u];

+-  

+-  		//Swap into place

+-  		//This dominates runtime, mostly in the swap and bin lookups

+-  		RandomAccessIter nextbinstart = first;

+-  		for(unsigned u = 0; u < bin_count - 1; ++u) {

+-  			RandomAccessIter * local_bin = bins + u;

+-  			nextbinstart += bin_sizes[u];

+-  			//Iterating over each element in this bin

+-  			for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {

+-  				//Swapping elements in current into place until the correct element has been swapped in

+-  				for(target_bin = (bins + ((*current >> log_divisor) - div_min));  target_bin != local_bin; 

+-  					target_bin = bins + ((*current >> log_divisor) - div_min)) {

+-  					//3-way swap; this is about 1% faster than a 2-way swap with integers

+-  					//The main advantage is less copies are involved per item put in the correct place

+-  					data_type tmp;

+-  					RandomAccessIter b = (*target_bin)++;

+-  					RandomAccessIter * b_bin = bins + ((*b >> log_divisor) - div_min);

+-  					if (b_bin != local_bin) {

+-  						RandomAccessIter c = (*b_bin)++;

+-  						tmp = *c;

+-  						*c = *b;

+-  					} 

+-  					else

+-  						tmp = *b;

+-  					*b = *current;

+-  					*current = tmp;

+-  				}

+-  			}

+-  			*local_bin = nextbinstart;

+-  		}

+-  		bins[bin_count - 1] = last;

+-  

+-  		//If we've bucketsorted, the array is sorted and we should skip recursion

+-  		if(!log_divisor)

+-  			return;

+-  

+-  		//Recursing; log_divisor is the remaining range

+-  		size_t max_count = get_max_count(log_divisor, last - first);

+-  		RandomAccessIter lastPos = first;

+-  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {

+-  			size_t count = bin_cache[u] - lastPos;

+-  			//don't sort unless there are at least two items to compare

+-  			if(count < 2)

+-  				continue;

+-  			//using std::sort if its worst-case is better

+-  			if(count < max_count)

+-  				std::sort(lastPos, bin_cache[u]);

+-  			else

+-  				spread_sort_rec<RandomAccessIter, div_type, data_type>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes);

+-  		}

+-  	}

+-

+-  	//Generic bitshift-based 3-way swapping code

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>

+-  	inline void inner_swap_loop(RandomAccessIter * bins, const RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift

+-  		, const unsigned log_divisor, const div_type div_min) 

+-  	{

+-  		RandomAccessIter * local_bin = bins + ii;

+-  		for(RandomAccessIter current = *local_bin; current < nextbinstart; ++current) {

+-  			for(RandomAccessIter * target_bin = (bins + (shift(*current, log_divisor) - div_min));  target_bin != local_bin; 

+-  				target_bin = bins + (shift(*current, log_divisor) - div_min)) {

+-  				data_type tmp;

+-  				RandomAccessIter b = (*target_bin)++;

+-  				RandomAccessIter * b_bin = bins + (shift(*b, log_divisor) - div_min);

+-  				//Three-way swap; if the item to be swapped doesn't belong in the current bin, swap it to where it belongs

+-  				if (b_bin != local_bin) {

+-  					RandomAccessIter c = (*b_bin)++;

+-  					tmp = *c;

+-  					*c = *b;

+-  				} 

+-  				//Note: we could increment current once the swap is done in this case, but that seems to impair performance

+-  				else

+-  					tmp = *b;

+-  				*b = *current;

+-  				*current = tmp;

+-  			}

+-  		}

+-  		*local_bin = nextbinstart;

+-  	}

+-

+-  	//Standard swapping wrapper for ascending values

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>

+-  	inline void swap_loop(RandomAccessIter * bins, RandomAccessIter & nextbinstart, unsigned ii, right_shift &shift

+-  		, const std::vector<size_t> &bin_sizes, const unsigned log_divisor, const div_type div_min) 

+-  	{

+-  		nextbinstart += bin_sizes[ii];

+-  		inner_swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, log_divisor, div_min);

+-  	}

+-

+-  	//Functor implementation for recursive sorting

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>

+-  	inline void 

+-  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset

+-  					, std::vector<size_t> &bin_sizes, right_shift shift, compare comp)

+-  	{

+-  		RandomAccessIter max, min;

+-  		find_extremes(first, last, max, min, comp);

+-  		if(max == min)

+-  			return;

+-  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));

+-  		div_type div_min = shift(*min, log_divisor);

+-  		div_type div_max = shift(*max, log_divisor);

+-  		unsigned bin_count = div_max - div_min + 1;

+-  		unsigned cache_end;

+-  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);

+-  			

+-  		//Calculating the size of each bin

+-  		for (RandomAccessIter current = first; current != last;)

+-  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;

+-  		bins[0] = first;

+-  		for(unsigned u = 0; u < bin_count - 1; u++)

+-  			bins[u + 1] = bins[u] + bin_sizes[u];

+-  		

+-  		//Swap into place

+-  		RandomAccessIter nextbinstart = first;

+-  		for(unsigned u = 0; u < bin_count - 1; ++u)

+-  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, u, shift, bin_sizes, log_divisor, div_min);

+-  		bins[bin_count - 1] = last;

+-  		

+-  		//If we've bucketsorted, the array is sorted and we should skip recursion

+-  		if(!log_divisor)

+-  			return;

+-  		

+-  		//Recursing

+-  		size_t max_count = get_max_count(log_divisor, last - first);

+-  		RandomAccessIter lastPos = first;

+-  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {

+-  			size_t count = bin_cache[u] - lastPos;

+-  			if(count < 2)

+-  				continue;

+-  			if(count < max_count)

+-  				std::sort(lastPos, bin_cache[u], comp);

+-  			else

+-  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift, comp);

+-  		}

+-  	}

+-

+-  	//Functor implementation for recursive sorting with only Shift overridden

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>

+-  	inline void 

+-  	spread_sort_rec(RandomAccessIter first, RandomAccessIter last, std::vector<RandomAccessIter> &bin_cache, unsigned cache_offset

+-  					, std::vector<size_t> &bin_sizes, right_shift shift)

+-  	{

+-  		RandomAccessIter max, min;

+-  		find_extremes(first, last, max, min);

+-  		if(max == min)

+-  			return;

+-  		unsigned log_divisor = get_log_divisor(last - first, rough_log_2_size((size_t)(shift(*max, 0)) - (shift(*min, 0))));

+-  		div_type div_min = shift(*min, log_divisor);

+-  		div_type div_max = shift(*max, log_divisor);

+-  		unsigned bin_count = div_max - div_min + 1;

+-  		unsigned cache_end;

+-  		RandomAccessIter * bins = size_bins(bin_sizes, bin_cache, cache_offset, cache_end, bin_count);

+-  			

+-  		//Calculating the size of each bin

+-  		for (RandomAccessIter current = first; current != last;)

+-  			bin_sizes[shift(*(current++), log_divisor) - div_min]++;

+-  		bins[0] = first;

+-  		for(unsigned u = 0; u < bin_count - 1; u++)

+-  			bins[u + 1] = bins[u] + bin_sizes[u];

+-  		

+-  		//Swap into place

+-  		RandomAccessIter nextbinstart = first;

+-  		for(unsigned ii = 0; ii < bin_count - 1; ++ii)

+-  			swap_loop<RandomAccessIter, div_type, data_type, right_shift>(bins, nextbinstart, ii, shift, bin_sizes, log_divisor, div_min);

+-  		bins[bin_count - 1] = last;

+-  		

+-  		//If we've bucketsorted, the array is sorted and we should skip recursion

+-  		if(!log_divisor)

+-  			return;

+-  		

+-  		//Recursing

+-  		size_t max_count = get_max_count(log_divisor, last - first);

+-  		RandomAccessIter lastPos = first;

+-  		for(unsigned u = cache_offset; u < cache_end; lastPos = bin_cache[u], ++u) {

+-  			size_t count = bin_cache[u] - lastPos;

+-  			if(count < 2)

+-  				continue;

+-  			if(count < max_count)

+-  				std::sort(lastPos, bin_cache[u]);

+-  			else

+-  				spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(lastPos, bin_cache[u], bin_cache, cache_end, bin_sizes, shift);

+-  		}

+-  	}

+-

+-  	//Holds the bin vector and makes the initial recursive call

+-  	template <class RandomAccessIter, class div_type, class data_type>

+-  	inline void 

+-  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type)

+-  	{

+-  		std::vector<size_t> bin_sizes;

+-  		std::vector<RandomAccessIter> bin_cache;

+-  		spread_sort_rec<RandomAccessIter, div_type, data_type>(first, last, bin_cache, 0, bin_sizes);

+-  	}

+-

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift, class compare>

+-  	inline void 

+-  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift, compare comp)

+-  	{

+-  		std::vector<size_t> bin_sizes;

+-  		std::vector<RandomAccessIter> bin_cache;

+-  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift, compare>(first, last, bin_cache, 0, bin_sizes, shift, comp);

+-  	}

+-

+-  	template <class RandomAccessIter, class div_type, class data_type, class right_shift>

+-  	inline void 

+-  	spread_sort(RandomAccessIter first, RandomAccessIter last, div_type, data_type, right_shift shift)

+-  	{

+-  		std::vector<size_t> bin_sizes;

+-  		std::vector<RandomAccessIter> bin_cache;

+-  		spread_sort_rec<RandomAccessIter, div_type, data_type, right_shift>(first, last, bin_cache, 0, bin_sizes, shift);

+-  	}

+-  }

+-

+-  //Top-level sorting call for integers

+-  template <class RandomAccessIter>

+-  inline void integer_sort(RandomAccessIter first, RandomAccessIter last) 

+-  {

+-  	//Don't sort if it's too small to optimize

+-  	if(last - first < detail::MIN_SORT_SIZE)

+-