diff options
| author | Roland Green <[email protected]> | 2019-08-26 15:14:22 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-26 15:14:22 -0400 |
| commit | b88c9e9a545960b7fcc1c373b60005612296158b (patch) | |
| tree | 1e32c07e932b3d3cc6b977e29a1327274f4f29a8 /src/intersim2/trafficmanager.hpp | |
| parent | 2a6788b59055b5ce694882a282af0cc6311854d4 (diff) | |
| parent | 6be23a1b36a3311c7dafc45a5e692e38cb351337 (diff) | |
Merge branch 'dev' into fix_warnings
Diffstat (limited to 'src/intersim2/trafficmanager.hpp')
| -rw-r--r-- | src/intersim2/trafficmanager.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/intersim2/trafficmanager.hpp b/src/intersim2/trafficmanager.hpp index 9694df4..97564ea 100644 --- a/src/intersim2/trafficmanager.hpp +++ b/src/intersim2/trafficmanager.hpp @@ -113,9 +113,9 @@ protected: vector<vector<bool> > _qdrained; vector<vector<list<Flit *> > > _partial_packets; - vector<map<int, Flit *> > _total_in_flight_flits; - vector<map<int, Flit *> > _measured_in_flight_flits; - vector<map<int, Flit *> > _retired_packets; + vector<map<unsigned long long, Flit *> > _total_in_flight_flits; + vector<map<unsigned long long, Flit *> > _measured_in_flight_flits; + vector<map<unsigned long long, Flit *> > _retired_packets; bool _empty_network; bool _hold_switch_for_packet; @@ -229,12 +229,12 @@ protected: vector<double> _warmup_threshold; vector<double> _acc_warmup_threshold; - int _cur_id; - int _cur_pid; + unsigned long long _cur_id; + unsigned long long _cur_pid; int _time; - set<int> _flits_to_watch; - set<int> _packets_to_watch; + set<unsigned long long> _flits_to_watch; + set<unsigned long long> _packets_to_watch; bool _print_csv_results; |