From 51e7034690b3db8b18b2dee59e896181cf2eca24 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Thu, 23 Jun 2016 13:13:48 -0700
Subject: prefix make_unique in binaryen_shell for visual studio workarounds
 (#595)

---
 src/tools/binaryen-shell.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tools/binaryen-shell.cpp')

diff --git a/src/tools/binaryen-shell.cpp b/src/tools/binaryen-shell.cpp
index b6cace769..8e6622de3 100644
--- a/src/tools/binaryen-shell.cpp
+++ b/src/tools/binaryen-shell.cpp
@@ -77,8 +77,8 @@ static void run_asserts(size_t* i, bool* checked, Module* wasm,
   std::unique_ptr<ShellExternalInterface> interface;
   std::unique_ptr<ModuleInstance> instance;
   if (wasm) {
-    interface = make_unique<ShellExternalInterface>();
-    instance = make_unique<ModuleInstance>(*wasm, interface.get());
+    interface = wasm::make_unique<ShellExternalInterface>(); // prefix make_unique to work around visual studio bugs
+    instance = wasm::make_unique<ModuleInstance>(*wasm, interface.get());
     if (entry.is()) {
       Function* function = wasm->getFunction(entry);
       if (!function) {
@@ -201,7 +201,7 @@ int main(int argc, const char* argv[]) {
 
   std::unique_ptr<Output> output;
   if (options.extra.count("output") > 0) {
-    output = make_unique<Output>(options.extra["output"], Flags::Text, options.debug ? Flags::Debug : Flags::Release);
+    output = wasm::make_unique<Output>(options.extra["output"], Flags::Text, options.debug ? Flags::Debug : Flags::Release);
   }
 
   bool checked = false;
@@ -220,7 +220,7 @@ int main(int argc, const char* argv[]) {
         if (options.debug) std::cerr << "parsing s-expressions to wasm...\n";
         Module wasm;
         std::unique_ptr<SExpressionWasmBuilder> builder;
-        builder = make_unique<SExpressionWasmBuilder>(wasm, *root[i]);
+        builder = wasm::make_unique<SExpressionWasmBuilder>(wasm, *root[i]);
         i++;
         assert(WasmValidator().validate(wasm));
 
-- 
cgit v1.2.3