---

yaml
---
r: 4863
b: refs/heads/master
c: 4aa1655
h: refs/heads/master
i:
  4861: 6ea4bfd
  4859: 4d4428e
  4855: ce6dbd7
  4847: 829afde
  4831: c6c9fe5
  4799: f747cd9
  4735: e82535e
  4607: 90c3a45
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6751d40c607c79dd81b4cbc5a07892271a128754
+refs/heads/master: 4aa165553bfb2a74e2e54f08fd9507e23bc24708

trunk/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

trunk/src/rt/rust_shape.h

@@ -665,6 +665,24 @@ class ptr_pair {
     }
 };
 
+// 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