Move bump_dp, get_dp from rust_shape.cpp to rust_shape.h

Put out the darwin fire for real

Author: brson

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

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