And reverted in r177083 because I fixed the underlying problem.
On Fri, Jul 22, 2011 at 11:06 PM, Ollie Wild <a...@google.com> wrote: > Ok for inclusion in google/gcc-4_6. > > Ollie > > On Fri, Jul 22, 2011 at 5:46 PM, Jeffrey Yasskin <jyass...@google.com> wrote: >> >> For the google/gcc-4_6 branch _only_. I'll fix the inconsistency in >> debug locations later for trunk and google/main. >> >> In some translation units the debug location of make_heap is the >> location of its name; in other TUs it's the location of the closing >> ')'. This causes false positives in gold's ODR checker. Until I can >> find why the locations are inconsistent, we can work around the >> problem by putting the name and closing ')' on the same line. >> >> libstdc++-v3/ChangeLog >> 2011-07-22 Jeffrey Yasskin <jyass...@google.com> >> >> * include/bits/stl_heap.h(make_heap): Remove a newline. >
