Enable -Wshadow and silence warnings

CMakeLists.txt

@@ -73,6 +73,7 @@ else()
         -Wno-missing-braces
         -Wconversion
         -Wsign-conversion
+        -Wshadow
         -Werror)
 endif()
 

src/literal_number.cpp

@@ -9,8 +9,8 @@
 
 namespace Sirit {
 
-LiteralNumber::LiteralNumber(u64 raw, bool is_32)
+LiteralNumber::LiteralNumber(u64 raw_, bool is_32_)
-    : Operand{OperandType::Number}, raw{raw}, is_32{is_32} {}
+    : Operand{OperandType::Number}, raw{raw_}, is_32{is_32_} {}
 
 LiteralNumber::~LiteralNumber() = default;
 

src/literal_string.cpp

@@ -10,8 +10,8 @@
 
 namespace Sirit {
 
-LiteralString::LiteralString(std::string string)
+LiteralString::LiteralString(std::string string_)
-    : Operand{OperandType::String}, string{std::move(string)} {}
+    : Operand{OperandType::String}, string{std::move(string_)} {}
 
 LiteralString::~LiteralString() = default;
 

src/op.cpp

@@ -16,8 +16,8 @@
 
 namespace Sirit {
 
-Op::Op(spv::Op opcode, std::optional<u32> id, Id result_type)
+Op::Op(spv::Op opcode_, std::optional<u32> id_, Id result_type_)
-    : Operand{OperandType::Op}, opcode(opcode), result_type(result_type), id(id) {}
+    : Operand{OperandType::Op}, opcode{opcode_}, result_type{result_type_}, id{id_} {}
 
 Op::~Op() = default;
 

src/operand.cpp

@@ -9,7 +9,7 @@
 
 namespace Sirit {
 
-Operand::Operand(OperandType operand_type) : operand_type{operand_type} {}
+Operand::Operand(OperandType operand_type_) : operand_type{operand_type_} {}
 
 Operand::~Operand() = default;
 

src/sirit.cpp

@@ -20,7 +20,7 @@ static void WriteSet(Stream& stream, const T& set) {
     }
 }
 
-Module::Module(u32 version) : version(version) {}
+Module::Module(u32 version_) : version{version_} {}
 
 Module::~Module() = default;
 

src/stream.cpp

@@ -8,7 +8,7 @@
 
 namespace Sirit {
 
-Stream::Stream(std::vector<u32>& words) : words(words) {}
+Stream::Stream(std::vector<u32>& words_) : words{words_} {}
 
 Stream::~Stream() = default;