Fix shadowing warnings reported by GCC

This commit is contained in:
David Neto 2016-01-06 14:43:55 -05:00
parent ba73a7cee5
commit ae7d707fdb
3 changed files with 9 additions and 8 deletions

View File

@ -375,9 +375,9 @@ class HexFloat {
} }
} }
uint_type value = 0; uint_type new_value = 0;
if (negative) { if (negative) {
value |= sign_mask; new_value |= sign_mask;
} }
exponent += exponent_bias; exponent += exponent_bias;
assert(exponent >= 0); assert(exponent >= 0);
@ -385,8 +385,8 @@ class HexFloat {
// put it all together // put it all together
exponent = (exponent << exponent_left_shift) & exponent_mask; exponent = (exponent << exponent_left_shift) & exponent_mask;
significand &= fraction_encode_mask; significand &= fraction_encode_mask;
value |= exponent | significand; new_value |= exponent | significand;
value_ = BitwiseCast<T>(value); value_ = BitwiseCast<T>(new_value);
} }
// Increments the significand of this number by the given amount. // Increments the significand of this number by the given amount.

View File

@ -128,9 +128,9 @@ class ClampToZeroIfUnsignedType<
// Encapsulates the data used during the assembly of a SPIR-V module. // Encapsulates the data used during the assembly of a SPIR-V module.
class AssemblyContext { class AssemblyContext {
public: public:
AssemblyContext(spv_text text, spv_diagnostic* diagnostic) AssemblyContext(spv_text text, spv_diagnostic* diagnostic_arg)
: current_position_({}), : current_position_({}),
pDiagnostic_(diagnostic), pDiagnostic_(diagnostic_arg),
text_(text), text_(text),
bound_(1) {} bound_(1) {}

View File

@ -115,8 +115,9 @@ const vector<vector<SpvOp>>& GetModuleOrder() {
namespace libspirv { namespace libspirv {
ValidationState_t::ValidationState_t(spv_diagnostic* diag, uint32_t options) ValidationState_t::ValidationState_t(spv_diagnostic* diagnostic,
: diagnostic_(diag), uint32_t options)
: diagnostic_(diagnostic),
instruction_counter_(0), instruction_counter_(0),
defined_ids_{}, defined_ids_{},
unresolved_forward_ids_{}, unresolved_forward_ids_{},