Ensure simulator does not re-initialize same chip type
Change-Id: I4bf3dd45ca30a977dd629acf8e4654c5385fac30
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/src/hei_chip.hpp b/src/hei_chip.hpp
index 3b17164..20b0b8c 100644
--- a/src/hei_chip.hpp
+++ b/src/hei_chip.hpp
@@ -12,14 +12,6 @@
class Chip
{
public: // Constructors, destructors, assignment, etc.
- Chip() = default;
-
- ~Chip() = default;
-
- Chip(const Chip&) = default;
-
- Chip& operator=(const Chip&) = default;
-
/**
* @brief Constructor.
* @param i_chip See description for iv_chip.
@@ -29,6 +21,12 @@
iv_chip(i_chip), iv_type(i_type)
{}
+ ~Chip() = default;
+
+ Chip(const Chip&) = default;
+
+ Chip& operator=(const Chip&) = default;
+
public: // Accessors
const void* getChip() const
{
@@ -60,14 +58,14 @@
* purpose is to eventually get passed back to the user application with
* information associated with each chip.
*/
- const void* iv_chip = nullptr;
+ const void* iv_chip;
/**
* When doing analysis on a chip, the isolator will need to know the chip
* type in order to look up the correct information from the Chip Data
* Files.
*/
- ChipType_t iv_type = CHIP_TYPE_INVALID;
+ ChipType_t iv_type;
}; // end class Chip