From ce59b2c4ed93e27cb7cc226e6c749769f37e30ce Mon Sep 17 00:00:00 2001 From: "Andrew M. B. Boktor" Date: Fri, 13 Apr 2012 15:16:51 -0800 Subject: 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] --- src/intersim/selalloc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/intersim/selalloc.cpp') 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( ) ) { -- cgit v1.3