Update of /cvsroot/boost/boost/boost/asio/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32707
Modified Files:
win_iocp_socket_service.hpp
Log Message:
Eliminate spurious warning for MSVC8 when using /W4 and /Wp64.
Index: win_iocp_socket_service.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/win_iocp_socket_service.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- win_iocp_socket_service.hpp 12 May 2007 10:48:24 -0000 1.15
+++ win_iocp_socket_service.hpp 31 Jul 2007 11:35:00 -0000 1.16
@@ -1951,26 +1951,29 @@
}
private:
- // Helper function to provide InterlockedCompareExchangePointer functionality
- // on very old Platform SDKs.
+ // Helper function to emulate InterlockedCompareExchangePointer functionality
+ // for:
+ // - very old Platform SDKs; and
+ // - platform SDKs where MSVC's /Wp64 option causes spurious warnings.
void* interlocked_compare_exchange_pointer(void** dest, void* exch, void*
cmp)
{
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT <= 0x400) && (_M_IX86)
+#if defined(_M_IX86)
return reinterpret_cast<void*>(InterlockedCompareExchange(
- reinterpret_cast<LONG*>(dest), reinterpret_cast<LONG>(exch),
+ reinterpret_cast<PLONG>(dest), reinterpret_cast<LONG>(exch),
reinterpret_cast<LONG>(cmp)));
#else
return InterlockedCompareExchangePointer(dest, exch, cmp);
#endif
}
- // Helper function to provide InterlockedExchangePointer functionality on
very
- // old Platform SDKs.
+ // Helper function to emulate InterlockedExchangePointer functionality for:
+ // - very old Platform SDKs; and
+ // - platform SDKs where MSVC's /Wp64 option causes spurious warnings.
void* interlocked_exchange_pointer(void** dest, void* val)
{
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT <= 0x400) && (_M_IX86)
+#if defined(_M_IX86)
return reinterpret_cast<void*>(InterlockedExchange(
- reinterpret_cast<LONG*>(dest), reinterpret_cast<LONG>(val)));
+ reinterpret_cast<PLONG>(dest), reinterpret_cast<LONG>(val)));
#else
return InterlockedExchangePointer(dest, val);
#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs