diff --git a/PGate.cc b/PGate.cc index afca2a575..56fd7578c 100644 --- a/PGate.cc +++ b/PGate.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com) + * Copyright (c) 1999-2013 Stephen Williams (steve@icarus.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU @@ -260,18 +260,16 @@ const char* PGBuiltin::gate_name() const } PGModule::PGModule(perm_string type, perm_string name, list*pins) -: PGate(name, pins), bound_type_(0), overrides_(0), pins_(0), +: PGate(name, pins), bound_type_(0), type_(type), overrides_(0), pins_(0), npins_(0), parms_(0), nparms_(0), msb_(0), lsb_(0) { - type_ = type; } PGModule::PGModule(perm_string type, perm_string name, named*pins, unsigned npins) -: PGate(name, 0), bound_type_(0), overrides_(0), pins_(pins), +: PGate(name, 0), bound_type_(0), type_(type), overrides_(0), pins_(pins), npins_(npins), parms_(0), nparms_(0), msb_(0), lsb_(0) { - type_ = type; } PGModule::PGModule(Module*type, perm_string name) diff --git a/cppcheck.sup b/cppcheck.sup index 002ac0e77..bb7936d4c 100644 --- a/cppcheck.sup +++ b/cppcheck.sup @@ -1,3 +1,3 @@ // These are correct and are used to find the base (zero) pin. -thisSubtraction:netlist.h:4430 -thisSubtraction:netlist.h:4439 +thisSubtraction:netlist.h:4432 +thisSubtraction:netlist.h:4441