<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="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="line-height:1.7;font-size:14px;font-family:arial"><div># From d515ac32f810fe6e6a986862771c85564193ee51 Mon Sep 17 00:00:00 2001<br>
</div></div></blockquote><div><br></div><div style>This extra from line seems to confuse hg import.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="line-height:1.7;font-size:14px;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>