summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-12-22 12:44:26 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-12-22 12:44:26 -0800
commitbf680f7553433c2cd0ffdd641e4e37fceed8b7ed (patch)
tree1acaead00ee104ea713737c1a97b5f98fd2bd0a5
parent475bc5601fcacc260d4aac6f71cfff5b224c4847 (diff)
parent2c1cf74201b03852f19082c1346ee5a80e6ed7cd (diff)
downloadbinaryen-bf680f7553433c2cd0ffdd641e4e37fceed8b7ed.tar.gz
binaryen-bf680f7553433c2cd0ffdd641e4e37fceed8b7ed.tar.bz2
binaryen-bf680f7553433c2cd0ffdd641e4e37fceed8b7ed.zip
Merge pull request #25 from WebAssembly/warn-struct-class
Fix warning on mixing struct / class
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/pass.h10
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72ec22970..9fcd28066 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS "-msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS}")
-SET(CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS "-O2 -Wall ${CMAKE_CXX_FLAGS}")
# clang doesn't print colored diagnostics when invoked from Ninja
IF (UNIX AND
diff --git a/src/pass.h b/src/pass.h
index cde9448ae..c03db2368 100644
--- a/src/pass.h
+++ b/src/pass.h
@@ -85,11 +85,12 @@ struct PassRunner {
//
// Core pass class
//
-struct Pass : public WasmWalker {
+class Pass : public WasmWalker {
+ public:
// Override this to perform preparation work before the pass runs
- virtual void prepare(PassRunner* runner, Module *module) {}
+ virtual void prepare(PassRunner* runner, Module* module) {}
- void run(PassRunner* runner, Module *module) {
+ void run(PassRunner* runner, Module* module) {
prepare(runner, module);
startWalk(module);
}
@@ -100,7 +101,8 @@ struct Pass : public WasmWalker {
// e.g. through PassRunner::getLast
// Handles names in a module, in particular adding names without duplicates
-struct NameManager : public Pass {
+class NameManager : public Pass {
+ public:
Name getUnique(std::string prefix);
// TODO: getUniqueInFunction