cleanup to allow binaryen to be built in more strict environments (#3566)

2 files changed, 4 insertions, 3 deletions

diff --git a/src/emscripten-optimizer/istring.h b/src/emscripten-optimizer/istring.h
index af3386162..69df761fd 100644
--- a/src/emscripten-optimizer/istring.h
+++ b/src/emscripten-optimizer/istring.h
@@ -48,11 +48,11 @@ struct IString {
     return (size_t)hash;
   }
 
-  class CStringHash : public std::hash<const char*> {
+  class CStringHash {
   public:
     size_t operator()(const char* str) const { return IString::hash_c(str); }
   };
-  class CStringEqual : public std::equal_to<const char*> {
+  class CStringEqual {
   public:
     bool operator()(const char* x, const char* y) const {
       return strcmp(x, y) == 0;
diff --git a/src/emscripten-optimizer/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index d763dc17d..720ac858e 100644
--- a/src/emscripten-optimizer/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
@@ -205,7 +205,8 @@ AsmSign detectSign(Ref node, IString minifiedFround) {
         if (op == TRSHIFT) {
           return ASM_UNSIGNED;
         }
-      } // fallthrough
+        [[fallthrough]];
+      }
       case '|':
       case '&':
       case '^':