diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-01 22:22:57 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-01 22:22:57 +0000 |
| commit | 9e169c4bf36a38689550c059570c57efbf00a6fb (patch) | |
| tree | 95e6800f7ac2a49ff7f799d96f04172320e70ac0 /libstdc++-v3/include/parallel/multiway_mergesort.h | |
| parent | 6170dfb6edfb7b19f8ae5209b8f948fe0076a4ad (diff) | |
| download | gcc-vect256.tar.gz | |
Merged trunk at revision 161680 into branch.vect256
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/vect256@161681 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/parallel/multiway_mergesort.h')
| -rw-r--r-- | libstdc++-v3/include/parallel/multiway_mergesort.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/parallel/multiway_mergesort.h b/libstdc++-v3/include/parallel/multiway_mergesort.h index 85894719dc0..8e2c53ec661 100644 --- a/libstdc++-v3/include/parallel/multiway_mergesort.h +++ b/libstdc++-v3/include/parallel/multiway_mergesort.h @@ -434,7 +434,7 @@ namespace __gnu_parallel (::operator new(__size * sizeof(_ValueType))); } else - __sd._M_samples = NULL; + __sd._M_samples = 0; __sd._M_offsets = new _DifferenceType[__num_threads - 1]; __sd._M_pieces |