diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-03-12 18:03:10 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-03-12 18:03:48 -0700 |
| commit | 3de30f4ef2f535b4cec24bba6166b8275d8400af (patch) | |
| tree | 498db7d55cf3edb752ecb5ba6e3953384320786b /src/rt/rust_shape.cpp | |
| parent | dd610a151bfde75e496d5bbaef95b63bd52bb822 (diff) | |
| download | rust-3de30f4ef2f535b4cec24bba6166b8275d8400af.tar.gz rust-3de30f4ef2f535b4cec24bba6166b8275d8400af.zip | |
rt: Change alignof to rust_alignof. Remove -Wno-c++11-compat. Closes #1644
Diffstat (limited to 'src/rt/rust_shape.cpp')
| -rw-r--r-- | src/rt/rust_shape.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp index ef53a7ca7fa..9883400d173 100644 --- a/src/rt/rust_shape.cpp +++ b/src/rt/rust_shape.cpp @@ -212,7 +212,7 @@ size_of::compute_tag_size(tag_info &tinfo) { tinfo.tag_sa.set(1, 1); } else { // Add in space for the tag. - tinfo.tag_sa.add(sizeof(tag_variant_t), alignof<tag_align_t>()); + tinfo.tag_sa.add(sizeof(tag_variant_t), rust_alignof<tag_align_t>()); } } @@ -277,7 +277,7 @@ private: } inline void cmp_two_pointers() { - ALIGN_TO(alignof<void *>()); + ALIGN_TO(rust_alignof<void *>()); data_pair<uint8_t *> fst = bump_dp<uint8_t *>(dp); data_pair<uint8_t *> snd = bump_dp<uint8_t *>(dp); cmp_number(fst); @@ -286,7 +286,7 @@ private: } inline void cmp_pointer() { - ALIGN_TO(alignof<void *>()); + ALIGN_TO(rust_alignof<void *>()); cmp_number(bump_dp<uint8_t *>(dp)); } |
