<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jan 11, 2013 at 6:45 AM, Timur Iskhodzhanov <span dir="ltr"><<a href="mailto:timurrrr@google.com" target="_blank">timurrrr@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">2013/1/11 Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com">timurrrr@google.com</a>>:<br>
<div><div class="h5">> 2013/1/9 Timur Iskhodzhanov <<a href="mailto:timurrrr@google.com">timurrrr@google.com</a>>:<br>
>> Hi Lenny,<br>
>><br>
>> I believe your change has broken down the Windows build?<br>
>> Can you please fix or revert?<br>
>><br>
>> 1>Compiling...<br>
>> 1>DeltaAlgorithm.cpp<br>
>> 1>..\..\..\llvm\lib\Support\DeltaAlgorithm.cpp(32) : error C2664:<br>
>> 'std::_Tree<_Traits>::iterator::iterator(std::_Tree_nod<_Traits>::_Node<br>
>> *,const std::_Tree<_Traits> *)' : cannot convert parameter 1 from<br>
>> 'std::_Tree<_Traits>::const_iterator' to<br>
>> 'std::_Tree_nod<_Traits>::_Node *'<br>
>> 1> with<br>
>> 1> [<br>
>> 1> _Traits=std::_Tset_traits<llvm::DeltaAlgorithm::change_ty,std::less<llvm::DeltaAlgorithm::change_ty>,std::allocator<llvm::DeltaAlgorithm::change_ty>,false><br>
>> 1> ]<br>
>> 1> No user-defined-conversion operator available that can<br>
>> perform this conversion, or the operator cannot be called<br>
>> 1>..\..\..\llvm\lib\Support\DeltaAlgorithm.cpp(36) : error C2664:<br>
>> 'std::set<_Kty>::set(const std::less<_Ty> &,const std::allocator<_Ty><br>
>> &)' : cannot convert parameter 1 from<br>
>> 'std::_Tree<_Traits>::const_iterator' to 'const std::less<_Ty> &'<br>
>> 1> with<br>
>> 1> [<br>
>> 1> _Kty=llvm::DeltaAlgorithm::change_ty,<br>
>> 1> _Ty=llvm::DeltaAlgorithm::change_ty<br>
>> 1> ]<br>
>> 1> and<br>
>> 1> [<br>
>> 1> _Traits=std::_Tset_traits<llvm::DeltaAlgorithm::change_ty,std::less<llvm::DeltaAlgorithm::change_ty>,std::allocator<llvm::DeltaAlgorithm::change_ty>,false><br>
>> 1> ]<br>
>> 1> and<br>
>> 1> [<br>
>> 1> _Ty=llvm::DeltaAlgorithm::change_ty<br>
>> 1> ]<br>
>> 1> Reason: cannot convert from<br>
>> 'std::_Tree<_Traits>::const_iterator' to 'const std::less<_Ty>'<br>
><br>
> FTR, this error has happened on my windows bot with VS2008 installed.<br>
</div></div>Just checked - my local VS2010 is fine.<br>
<br>
I think LLVM doesn't require VS2010 yet?<br>
<div class="HOEnZb"><div class="h5"><br></div></div></blockquote><div><br></div><div style>It doesn't, but since he's been a bit unresponsive, go ahead and revert to unblock.</div><div style><br></div><div style>
-eric</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">
>> 2013/1/8 Lenny Maiorani <<a href="mailto:lenny@colorado.edu">lenny@colorado.edu</a>>:<br>
>>> Author: lenny<br>
>>> Date: Mon Jan 7 19:08:52 2013<br>
>>> New Revision: 171829<br>
>>><br>
>>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=171829&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=171829&view=rev</a><br>
>>> Log:<br>
>>> Split changeset_ty using iterators instead of loops.<br>
>>><br>
>>> Modified:<br>
>>> llvm/trunk/lib/Support/DeltaAlgorithm.cpp<br>
>>><br>
>>> Modified: llvm/trunk/lib/Support/DeltaAlgorithm.cpp<br>
>>> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/DeltaAlgorithm.cpp?rev=171829&r1=171828&r2=171829&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/DeltaAlgorithm.cpp?rev=171829&r1=171828&r2=171829&view=diff</a><br>
>>> ==============================================================================<br>
>>> --- llvm/trunk/lib/Support/DeltaAlgorithm.cpp (original)<br>
>>> +++ llvm/trunk/lib/Support/DeltaAlgorithm.cpp Mon Jan 7 19:08:52 2013<br>
>>> @@ -27,13 +27,15 @@<br>
>>><br>
>>> void DeltaAlgorithm::Split(const changeset_ty &S, changesetlist_ty &Res) {<br>
>>> // FIXME: Allow clients to provide heuristics for improved splitting.<br>
>>> + // Get the iterator to the middle.<br>
>>> + unsigned N = S.size() / 2;<br>
>>> + changeset_ty::iterator middle(S.begin());<br>
>>> + std::advance(middle, N);<br>
>>> +<br>
>>> + // Create each vector using the middle as the split.<br>
>>> + changeset_ty LHS(S.begin(), middle);<br>
>>> + changeset_ty RHS(middle, S.end());<br>
>>><br>
>>> - // FIXME: This is really slow.<br>
>>> - changeset_ty LHS, RHS;<br>
>>> - unsigned idx = 0, N = S.size() / 2;<br>
>>> - for (changeset_ty::const_iterator it = S.begin(),<br>
>>> - ie = S.end(); it != ie; ++it, ++idx)<br>
>>> - ((idx < N) ? LHS : RHS).insert(*it);<br>
>>> if (!LHS.empty())<br>
>>> Res.push_back(LHS);<br>
>>> if (!RHS.empty())<br>
>>><br>
>>><br>
>>> _______________________________________________<br>
>>> llvm-commits mailing list<br>
>>> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
>>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div>