Merged /trunk:r1906

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@1907 4e380d45-d1fd-0310-85a7-d18ec86df0ad
replace member flag variables for disabled features with static const variables

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@1909 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r1900-1905,1907-1909

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@1910 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r1910-1994.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@1995 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r1995-1997.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@1998 4e380d45-d1fd-0310-85a7-d18ec86df0ad
port to materialize_batch(): delay calling block_externally_updated() until the block is completely filled (and written out) (trunk: r1959, r1996 for materialize())

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2028 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r1998-2033.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2038 4e380d45-d1fd-0310-85a7-d18ec86df0ad
work around spurious g++-4.4 warning 'anonymous is/may be used uninitialized...' by reducing optimization

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2100 4e380d45-d1fd-0310-85a7-d18ec86df0ad
one more PR33361 case closed ...

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2101 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2034-2099

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2102 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2100-2105.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2107 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2106-2115.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2117 4e380d45-d1fd-0310-85a7-d18ec86df0ad
switch from 'bool deferred' to 'StartMode start_mode'

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2154 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2116-2122,2125,2135-2140,2147,2151-2153

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2155 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2123-2124,2126-2129

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2156 4e380d45-d1fd-0310-85a7-d18ec86df0ad
reformat with unctrustify

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2157 4e380d45-d1fd-0310-85a7-d18ec86df0ad
fully qualify the value of STXXL_START_PIPELINE_DEFERRED_DEFAULT

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2158 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2130

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2262 4e380d45-d1fd-0310-85a7-d18ec86df0ad
use out_block_type in batched merger methods, too

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2263 4e380d45-d1fd-0310-85a7-d18ec86df0ad
apply trunk r2127,2129 to the alternative basic_runs_merger constructor, too

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2264 4e380d45-d1fd-0310-85a7-d18ec86df0ad