From fe08a0c68cd042ac2509455fe7d80f0e63f9a5da Mon Sep 17 00:00:00 2001
From: Andreas Rossberg <rossberg@mpi-sws.org>
Date: Thu, 14 Nov 2019 16:36:22 +0100
Subject: [PATCH 1/2] C++ conformance tweaks

---
 include/wasm.h  | 6 +++---
 include/wasm.hh | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wasm.h b/include/wasm.h
index 5716194..46e75ca 100644
--- a/include/wasm.h
+++ b/include/wasm.h
@@ -1,7 +1,7 @@
 // WebAssembly C API
 
-#ifndef __WASM_H
-#define __WASM_H
+#ifndef WASM_H
+#define WASM_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -701,4 +701,4 @@ static inline void* wasm_val_ptr(const wasm_val_t* val) {
 }  // extern "C"
 #endif
 
-#endif  // #ifdef __WASM_H
+#endif  // #ifdef WASM_H
diff --git a/include/wasm.hh b/include/wasm.hh
index 2c505e3..fafc7d4 100644
--- a/include/wasm.hh
+++ b/include/wasm.hh
@@ -1,7 +1,7 @@
 // WebAssembly C++ API
 
-#ifndef __WASM_HH
-#define __WASM_HH
+#ifndef WASM_HH
+#define WASM_HH
 
 #include <cassert>
 #include <cstddef>
@@ -158,7 +158,7 @@ public:
 
   template<class... Ts>
   static auto make(Ts&&... args) -> vec {
-    T data[] = { std::move(args)... };
+    T data[] = { std::forward<Ts>(args)... };
     return make(sizeof...(Ts), data);
   }
 
@@ -743,4 +743,4 @@ public:
 
 }  // namespace wasm
 
-#endif  // #ifdef __WASM_HH
+#endif  // #ifdef WASM_HH

From 0d932408bfd2ad24cd756332d412bc41a167a00a Mon Sep 17 00:00:00 2001
From: Andreas Rossberg <rossberg@mpi-sws.org>
Date: Thu, 14 Nov 2019 17:23:29 +0100
Subject: [PATCH 2/2] Fix bug introduced in #111

---
 src/wasm-c.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wasm-c.cc b/src/wasm-c.cc
index 3d2a2d5..96df9f0 100644
--- a/src/wasm-c.cc
+++ b/src/wasm-c.cc
@@ -149,7 +149,7 @@ struct borrowed_vec {
   } \
   \
   void wasm_##name##_vec_copy( \
-    wasm_##name##_vec_t* out, wasm_##name##_vec_t* v \
+    wasm_##name##_vec_t* out, const wasm_##name##_vec_t* v \
   ) { \
     wasm_##name##_vec_new(out, v->size, v->data); \
   }
@@ -171,7 +171,7 @@ struct borrowed_vec {
   } \
   \
   void wasm_##name##_vec_copy( \
-    wasm_##name##_vec_t* out, wasm_##name##_vec_t* v \
+    wasm_##name##_vec_t* out, const wasm_##name##_vec_t* v \
   ) { \
     auto v2 = ownvec<Name>::make_uninitialized(v->size); \
     for (size_t i = 0; i < v2.size(); ++i) { \
@@ -632,7 +632,7 @@ void wasm_val_vec_new(
   *out = release_val_vec(std::move(v2));
 }
 
-void wasm_val_vec_copy(wasm_val_vec_t* out, wasm_val_vec_t* v) {
+void wasm_val_vec_copy(wasm_val_vec_t* out, const wasm_val_vec_t* v) {
   auto v2 = vec<Val>::make_uninitialized(v->size);
   for (size_t i = 0; i < v2.size(); ++i) {
     wasm_val_t val;