diff options
author | Alon Zakai <alonzakai@gmail.com> | 2016-03-28 18:26:24 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2016-03-28 18:26:24 -0700 |
commit | fb0d9509f23472df14d03d93d333d242d23bd2bd (patch) | |
tree | 40afeae744cd0355e27f18e45f2911c1d01c31f3 /src/s2wasm-main.cpp | |
parent | 97972db66d30c1acb716e4f7a421f1fbe7410927 (diff) | |
parent | 5cc2c2182332cd17bf12e3cdb58e61d0582eafc1 (diff) | |
download | binaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.tar.gz binaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.tar.bz2 binaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.zip |
Merge pull request #287 from WebAssembly/vs2015_fixes
VS2015 fixes
Diffstat (limited to 'src/s2wasm-main.cpp')
-rw-r--r-- | src/s2wasm-main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/s2wasm-main.cpp b/src/s2wasm-main.cpp index 752494aac..40009cbc9 100644 --- a/src/s2wasm-main.cpp +++ b/src/s2wasm-main.cpp @@ -78,18 +78,18 @@ int main(int argc, const char *argv[]) { if (options.debug) std::cerr << "Parsing and wasming..." << std::endl; AllocatingModule wasm; - size_t globalBase = options.extra.find("global-base") != options.extra.end() + uint64_t globalBase = options.extra.find("global-base") != options.extra.end() ? std::stoull(options.extra["global-base"]) : 1; - size_t stackAllocation = + uint64_t stackAllocation = options.extra.find("stack-allocation") != options.extra.end() ? std::stoull(options.extra["stack-allocation"]) : 0; - size_t initialMem = + uint64_t initialMem = options.extra.find("initial-memory") != options.extra.end() ? std::stoull(options.extra["initial-memory"]) : 0; - size_t maxMem = + uint64_t maxMem = options.extra.find("max-memory") != options.extra.end() ? std::stoull(options.extra["max-memory"]) : 0; |