Symbols: introduced IPERL, ORACLE_DB, HEAT_METERS, TURA_IPERL, TURA_SPECIAL
abandoned IPERLST, IPERLSTSPECIAL, HEAT_METERS_SUPPORT
This commit is contained in:
@@ -49,12 +49,12 @@ namespace Results.Entities
|
||||
public virtual bool Compound { get; set; }
|
||||
public virtual bool HeatMeter { get; set; }
|
||||
|
||||
#if IPERLST || IPERLST_SPECIAL
|
||||
#if IPERL
|
||||
public virtual int WMTypeId { get; set; }
|
||||
public virtual int WMTypeRev { get; set; }
|
||||
#endif
|
||||
|
||||
public WaterMeterData()
|
||||
public WaterMeterData()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -103,11 +103,11 @@ namespace Results.Entities
|
||||
if (Compound != wmd.Compound) return false;
|
||||
if (HeatMeter != wmd.HeatMeter) return false;
|
||||
|
||||
#if IPERLST || IPERLST_SPECIAL
|
||||
#if IPERL
|
||||
if (WMTypeId != wmd.WMTypeId) return false;
|
||||
if (WMTypeRev != wmd.WMTypeRev) return false;
|
||||
#endif
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user