jlec 14/11/09 13:53:09 Added: colpack-1.0.9-fix_gcc49_omp.patch Log: sci-libs/colpack: Fix compilation with gcc-4.9, #514534 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.1 sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch?rev=1.1&content-type=text/plain Index: colpack-1.0.9-fix_gcc49_omp.patch =================================================================== Index: ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp =================================================================== --- ColPack-1.0.9.orig/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp +++ ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp @@ -388,8 +388,9 @@ namespace ColPack if ( m_vi_LeftVertexColors [m_vi_Edges [x]] == m_vi_LeftVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) { //Algo 4 - Line 18: add [v] to R ; cont <- false; break #pragma omp critical + { vi_verticesNeedNewColor.push_back(v); -#pragma omp end critical + } cont = false; break; } @@ -575,8 +576,9 @@ namespace ColPack if ( m_vi_RightVertexColors [m_vi_Edges [x]] == m_vi_RightVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) { //Algo 4 - Line 18: add [v] to R ; cont <- false; break #pragma omp critical + { vi_verticesNeedNewColor.push_back(v); -#pragma omp end critical + } cont = false; break; }