[x265] [PATCH 2/3] Disable #pragma in INTEL Compiler

[chen]

Not only this line, but also all of '#', I think we need remove '#' before.
Of course, I may apply patch to my local hg tree and make hg-format patch


在 2013-07-07 03:44:36，"Steve Borho" <steve at borho.org> 写道：






On Tue, Jul 2, 2013 at 3:59 AM, chen <chenm003 at 163.com> wrote:

# From d515ac32f810fe6e6a986862771c85564193ee51 Mon Sep 17 00:00:00 2001



This extra from line seems to confuse hg import.
 
# From: Min Chen <chenm003 at 163.com>
# Date: Mon, 1 Jul 2013 17:45:07 +0800
# Subject: [PATCH 2/3] Disable #pragma in INTEL Compiler
Disable #pragma in INTEL Compiler
---
 source/common/threadpool.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
index 1cc10ca..909337b 100644
--- a/source/common/threadpool.cpp
+++ b/source/common/threadpool.cpp
@@ -90,7 +90,9 @@ FORCEINLINE LONGLONG _InterlockedOr64(__inout LONGLONG volatile *Destination,
 }
 
 #define ATOMIC_OR(ptr, mask)            _InterlockedOr64((volatile LONG64*)ptr, mask)
+#if defined(__MSC_VER) && !defined(__INTEL_COMPILER)
 #pragma intrinsic(_InterlockedCompareExchange64)
+#endif
 #else // if _WIN32_WINNT <= _WIN32_WINNT_WINXP
 #define ATOMIC_OR(ptr, mask)            InterlockedOr64((volatile LONG64*)ptr, mask)
 #endif // if _WIN32_WINNT <= _WIN32_WINNT_WINXP
--
1.7.9.msysgit.0
 

_______________________________________________
x265-devel mailing list
x265-devel at videolan.org
http://mailman.videolan.org/listinfo/x265-devel







--
Steve Borho
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130707/519d0747/attachment.html>