diff options
| author | Andrew M. B. Boktor <[email protected]> | 2012-04-13 15:16:51 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:19:05 -0700 |
| commit | ce59b2c4ed93e27cb7cc226e6c749769f37e30ce (patch) | |
| tree | 245da25dbea1272aeb9a91804815e07855888457 /src/intersim/allocator.hpp | |
| parent | e1c63461d124b3ee5d18af54592ed1904816bcb5 (diff) | |
Merging
//depot/gpgpu_sim_research/fermi-test/distribution/src/intersim/...
to //depot/gpgpu_sim_research/fermi/distribution/src/intersim/...
Fixes a segmentation fault that happens with newer gcc.
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 11939]
Diffstat (limited to 'src/intersim/allocator.hpp')
| -rw-r--r-- | src/intersim/allocator.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intersim/allocator.hpp b/src/intersim/allocator.hpp index ac77a3a..8d92933 100644 --- a/src/intersim/allocator.hpp +++ b/src/intersim/allocator.hpp @@ -93,8 +93,8 @@ public: class SparseAllocator : public Allocator {
protected:
- list<int> _in_occ;
- list<int> _out_occ;
+ list<int> *_in_occ;
+ list<int> *_out_occ;
list<sRequest> *_in_req;
list<sRequest> *_out_req;
|