File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed
branches/try2/src/libcollections Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: 4184396f28d5612520f7b30718df9fff6918d239
8
+ refs/heads/try2: f14cb96b07517b5638bf966e6f6e30b946552912
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -848,7 +848,11 @@ impl<T> Vec<T> {
848
848
let ptr = self . ptr ;
849
849
let cap = self . cap ;
850
850
let begin = self . ptr as * const T ;
851
- let end = ( self . ptr as uint + self . len ( ) ) as * const T ;
851
+ let end = if mem:: size_of :: < T > ( ) == 0 {
852
+ ( ptr as uint + self . len ( ) ) as * const T ;
853
+ } else {
854
+ ptr. offset ( self . len ( ) as int )
855
+ } ;
852
856
mem:: forget ( self ) ;
853
857
MoveItems { allocation : ptr, cap : cap, ptr : begin, end : end }
854
858
}
You can’t perform that action at this time.
0 commit comments