<div style="line-height:1.7;color:#000000;font-size:14px;font-family:arial"><DIV>Not only this line, but also all of '#', I think we need remove '#' before.<BR>Of course, I may apply patch to my local hg tree and make hg-format patch</DIV>
<DIV></DIV>
<DIV id="divNeteaseMailCard"></DIV>
<DIV><BR></DIV>ÔÚ 2013-07-07 03:44:36£¬"Steve Borho" <steve@borho.org> дµÀ£º<BR>
<BLOCKQUOTE id="isReplyContent" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid">
<DIV dir="ltr"><BR>
<DIV class="gmail_extra"><BR><BR>
<DIV class="gmail_quote">On Tue, Jul 2, 2013 at 3:59 AM, chen <SPAN dir="ltr"><<A href="mailto:chenm003@163.com" target="_blank">chenm003@163.com</A>></SPAN> wrote:<BR>
<BLOCKQUOTE class="gmail_quote" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid">
<DIV style="FONT-SIZE: 14px; LINE-HEIGHT: 1.7; FONT-FAMILY: arial">
<DIV># From d515ac32f810fe6e6a986862771c85564193ee51 Mon Sep 17 00:00:00 2001<BR></DIV></DIV></BLOCKQUOTE>
<DIV><BR></DIV>
<DIV>This extra from line seems to confuse hg import.</DIV>
<DIV> </DIV>
<BLOCKQUOTE class="gmail_quote" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid">
<DIV style="FONT-SIZE: 14px; LINE-HEIGHT: 1.7; FONT-FAMILY: arial">
<DIV># From: Min Chen <<A href="mailto:chenm003@163.com" target="_blank">chenm003@163.com</A>><BR># Date: Mon, 1 Jul 2013 17:45:07 +0800<BR># Subject: [PATCH 2/3] Disable #pragma in INTEL Compiler<BR>Disable #pragma in INTEL Compiler</DIV>
<DIV>---<BR> source/common/threadpool.cpp | 2 ++<BR> 1 files changed, 2 insertions(+), 0 deletions(-)</DIV>
<DIV>diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp<BR>index 1cc10ca..909337b 100644<BR>--- a/source/common/threadpool.cpp<BR>+++ b/source/common/threadpool.cpp<BR>@@ -90,7 +90,9 @@ FORCEINLINE LONGLONG _InterlockedOr64(__inout LONGLONG volatile *Destination,<BR> }<BR> <BR> #define ATOMIC_OR(ptr, mask) _InterlockedOr64((volatile LONG64*)ptr, mask)<BR>+#if defined(__MSC_VER) && !defined(__INTEL_COMPILER)<BR> #pragma intrinsic(_InterlockedCompareExchange64)<BR>+#endif<BR> #else // if _WIN32_WINNT <= _WIN32_WINNT_WINXP<BR> #define ATOMIC_OR(ptr, mask) InterlockedOr64((volatile LONG64*)ptr, mask)<BR> #endif // if _WIN32_WINNT <= _WIN32_WINNT_WINXP<SPAN class="HOEnZb"><FONT color="#888888"><BR>-- <BR>1.7.9.msysgit.0</FONT></SPAN></DIV>
<DIV> </DIV></DIV><BR>_______________________________________________<BR>x265-devel mailing list<BR><A href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</A><BR><A href="http://mailman.videolan.org/listinfo/x265-devel" target="_blank">http://mailman.videolan.org/listinfo/x265-devel</A><BR><BR></BLOCKQUOTE></DIV><BR><BR clear="all">
<DIV><BR></DIV>-- <BR>Steve Borho </DIV></DIV></BLOCKQUOTE></div>