Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ if(MSVC)
add_nondebug_compile_flag("/O2")
add_compile_flag("/D_CRT_SECURE_NO_WARNINGS")
add_compile_flag("/D_SCL_SECURE_NO_WARNINGS")
# workaround for https://github.com/WebAssembly/binaryen/issues/3661
add_compile_flag("/D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING")
# Visual Studio 2018 15.8 implemented conformant support for std::aligned_storage, but the conformant support is only enabled when the following flag is passed, to avoid
# breaking backwards compatibility with code that relied on the non-conformant behavior (the old nonconformant behavior is not used with Binaryen)
add_compile_flag("/D_ENABLE_EXTENDED_ALIGNED_STORAGE")
Expand Down
2 changes: 1 addition & 1 deletion src/tools/wasm-shell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class Shell {
Builder::Immutable));
spectest->addGlobal(builder.makeGlobal(Name::fromInt(2),
Type::f32,
builder.makeConst<float>(666.6),
builder.makeConst<float>(666.6f),
Builder::Immutable));
spectest->addGlobal(builder.makeGlobal(Name::fromInt(3),
Type::f64,
Expand Down