X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/26ade07ab0e62b98b452fbbd18edba0450035e35..ab6c1548ac2b1907bca92c8ce43e919c1a649a6f:/endian.h

diff --git a/endian.h b/endian.h
index f34d371..feb3bbd 100644
--- a/endian.h
+++ b/endian.h
@@ -20,14 +20,18 @@ inline int64_t hton(int64_t t) { return (int64_t)hton((uint64_t)t); }
 
 template <class T> inline T ntoh(T t) { return hton(t); }
 
-template <class... Args, size_t... Indices> inline tuple<typename remove_reference<Args>::type...>
+template <class... Args, size_t... Indices>
+inline tuple<typename std::remove_reference<Args>::type...>
 tuple_hton_imp(tuple<Args...> && t, tuple_indices<Indices...>) {
-    return tuple<typename remove_reference<Args>::type...>(hton(get<Indices>(t))...);
+    return tuple<
+        typename std::remove_reference<Args>::type...
+    >(hton(std::get<Indices>(t))...);
 }
 
-template <class... Args> inline tuple<typename remove_reference<Args>::type...>
+template <class... Args>
+inline tuple<typename std::remove_reference<Args>::type...>
 hton(tuple<Args...> && t) {
-    return tuple_hton_imp(forward<tuple<Args...>>(t), TUPLE_INDICES(Args));
+    return tuple_hton_imp(std::forward<tuple<Args...>>(t), TUPLE_INDICES(Args));
 }
 
 template <class T> inline typename