[llvm-commits] [llvm] r118604 - in /llvm/trunk/lib/CodeGen: LiveIntervalUnion.cpp LiveIntervalUnion.h RegAllocBase.h RegAllocBasic.cpp

[Jakob Stoklund Olesen]

On Nov 9, 2010, at 11:01 AM, Andrew Trick wrote:
>     if (segPos != segments_.begin()) {
> -      SegmentIter prevPos = segPos;
> -      --prevPos;
> -      assert(prevPos->end <= segment.start && "overlapping segments" );
> +      assert(prior(segPos)->end <= segment.start && "overlapping segments" );
>     }
> -    SegmentIter nextPos = segPos;
> -    ++nextPos;
> +    SegmentIter nextPos = next(segPos);
>     if (nextPos != segments_.end())
>       assert(segment.end <= nextPos->start && "overlapping segments" );
> #endif // NDEBUG

Please spell these llvm::next() and llvm::prior().

Apparently, some C++ libraries (C++0x?) define std::next and std::prior, and Koenig lookup gets confused when our iterators derive from std::iterator.