diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-20 10:51:31 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-20 10:51:31 -0700 |
| commit | 4aa165553bfb2a74e2e54f08fd9507e23bc24708 (patch) | |
| tree | 79e41ce628ecce56244648b7b2d27c7db4e4c3db /src/rt | |
| parent | 6751d40c607c79dd81b4cbc5a07892271a128754 (diff) | |
| download | rust-4aa165553bfb2a74e2e54f08fd9507e23bc24708.tar.gz rust-4aa165553bfb2a74e2e54f08fd9507e23bc24708.zip | |
Move bump_dp, get_dp from rust_shape.cpp to rust_shape.h
Put out the darwin fire for real
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_shape.cpp | 18 | ||||
| -rw-r--r-- | src/rt/rust_shape.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp index aecb9254158..3a83f3d4c78 100644 --- a/src/rt/rust_shape.cpp +++ b/src/rt/rust_shape.cpp @@ -35,24 +35,6 @@ const uint8_t CMP_LE = 2u; namespace shape { -// NB: This function does not align. -template<typename T> -inline data_pair<T> -bump_dp(ptr_pair &ptr) { - data_pair<T> data(*reinterpret_cast<T *>(ptr.fst), - *reinterpret_cast<T *>(ptr.snd)); - ptr += sizeof(T); - return data; -} - -template<typename T> -inline data_pair<T> -get_dp(ptr_pair &ptr) { - data_pair<T> data(*reinterpret_cast<T *>(ptr.fst), - *reinterpret_cast<T *>(ptr.snd)); - return data; -} - // A shape printer, useful for debugging void diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h index d0e72005a34..2f1ba6c62ab 100644 --- a/src/rt/rust_shape.h +++ b/src/rt/rust_shape.h @@ -665,6 +665,24 @@ public: } }; +// NB: This function does not align. +template<typename T> +inline data_pair<T> +bump_dp(ptr_pair &ptr) { + data_pair<T> data(*reinterpret_cast<T *>(ptr.fst), + *reinterpret_cast<T *>(ptr.snd)); + ptr += sizeof(T); + return data; +} + +template<typename T> +inline data_pair<T> +get_dp(ptr_pair &ptr) { + data_pair<T> data(*reinterpret_cast<T *>(ptr.fst), + *reinterpret_cast<T *>(ptr.snd)); + return data; +} + } // end namespace shape |
