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/selalloc.cpp | |
| 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/selalloc.cpp')
| -rw-r--r-- | src/intersim/selalloc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intersim/selalloc.cpp b/src/intersim/selalloc.cpp index 53d31fe..fe14091 100644 --- a/src/intersim/selalloc.cpp +++ b/src/intersim/selalloc.cpp @@ -56,8 +56,8 @@ void SelAlloc::Allocate( ) for ( int iter = 0; iter < _iter; ++iter ) {
// Grant phase
- for ( outer_iter = _out_occ.begin( );
- outer_iter != _out_occ.end( ); ++outer_iter ) {
+ for ( outer_iter = _out_occ->begin( );
+ outer_iter != _out_occ->end( ); ++outer_iter ) {
output = *outer_iter;
// Skip loop if there are no requests
@@ -128,8 +128,8 @@ void SelAlloc::Allocate( ) // Accept phase
- for ( outer_iter = _in_occ.begin( );
- outer_iter != _in_occ.end( ); ++outer_iter ) {
+ for ( outer_iter = _in_occ->begin( );
+ outer_iter != _in_occ->end( ); ++outer_iter ) {
input = *outer_iter;
if ( _in_req[input].empty( ) ) {
|