Added Flyweight utility class
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I30ca984f914d782174292a1c673f62a60f506f7b
diff --git a/src/register/prdfScanFacility.C b/src/register/prdfScanFacility.C
index a0aadac..079efe9 100755
--- a/src/register/prdfScanFacility.C
+++ b/src/register/prdfScanFacility.C
@@ -32,10 +32,9 @@
//----------------------------------------------------------------------
#include <register/hei_register.hpp>
+#include <util/hei_flyweight.hpp>
#include <prdfScanFacility.H>
-#include <prdfFlyWeight.C>
-#include <prdfFlyWeightS.C>
namespace libhei
{
diff --git a/src/register/prdfScanFacility.H b/src/register/prdfScanFacility.H
index 501f72b..1b22e16 100755
--- a/src/register/prdfScanFacility.H
+++ b/src/register/prdfScanFacility.H
@@ -37,9 +37,8 @@
#include <register/hei_hardware_register.hpp>
#include <register/hei_operator_register.hpp>
+#include <util/hei_flyweight.hpp>
-#include <prdfFlyWeight.H>
-#include <prdfFlyWeightS.H>
#include <vector>
#include <prdfPlatServices.H>
@@ -204,18 +203,16 @@
private: // Data
- typedef FlyWeightS<HardwareRegister,50> ScanCommRegisters;
- //FIXME RTC 64345 Investigate benefit of changing below from FlyWeight to
- //FlyWeightS
- typedef FlyWeight<AttnTypeRegister,50> AttnTypeRegisters;
- typedef FlyWeightS<AndRegister,50> AndRegisters;
- typedef FlyWeightS<OrRegister,10> OrRegisters;
- typedef FlyWeightS<NotRegister,50> NotRegisters;
- typedef FlyWeightS<LeftShiftRegister,10> LeftShiftRegisters;
- typedef FlyWeightS<RightShiftRegister, 10> RightShiftRegisters;
- typedef FlyWeightS<SummaryRegister,10> SummaryRegisters;
- typedef FlyWeight<ConstantRegister, 10> ConstantRegisters;
- typedef FlyWeightS<ScomRegisterAccess, 10> PluginRegisters;
+ typedef Flyweight<HardwareRegister> ScanCommRegisters;
+ typedef Flyweight<AttnTypeRegister> AttnTypeRegisters;
+ typedef Flyweight<AndRegister> AndRegisters;
+ typedef Flyweight<OrRegister> OrRegisters;
+ typedef Flyweight<NotRegister> NotRegisters;
+ typedef Flyweight<LeftShiftRegister> LeftShiftRegisters;
+ typedef Flyweight<RightShiftRegister> RightShiftRegisters;
+ typedef Flyweight<SummaryRegister> SummaryRegisters;
+ typedef Flyweight<ConstantRegister> ConstantRegisters;
+ typedef Flyweight<ScomRegisterAccess> PluginRegisters;
ScanCommRegisters iv_scomRegFw;
AttnTypeRegisters iv_attnRegFw;