boostorg/detail
1
0
Fork 1
mirror of https://github.com/boostorg/detail.git synced 2025-07-31 21:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Quickbook: Merge from trunk to quickbook-dev

Browse Source 
[SVN r75739]
This commit is contained in:
Daniel James
2011-11-30 01:35:25 +00:00
parent 7a75882c6b
commit d570643a41
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/detail/container_fwd.hpp
View File

@@ -42,6 +42,10 @@
|| defined(_GLIBCXX_PARALLEL) \ || defined(_GLIBCXX_PARALLEL) \
|| defined(_GLIBCXX_PROFILE) || defined(_GLIBCXX_PROFILE)
# define BOOST_DETAIL_NO_CONTAINER_FWD # define BOOST_DETAIL_NO_CONTAINER_FWD
# else
# if defined(__GLIBCXX__) && __GLIBCXX__ >= 20040530
# define BOOST_CONTAINER_FWD_COMPLEX_STRUCT
# endif
# endif # endif
# elif defined(__STL_CONFIG_H) # elif defined(__STL_CONFIG_H)
// generic SGI STL // generic SGI STL
@@ -63,8 +67,6 @@
# elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER) # elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
// Dinkumware Library (this has to appear after any possible replacement // Dinkumware Library (this has to appear after any possible replacement
// libraries) // libraries)
//
// Works fine.
# else # else
# define BOOST_DETAIL_NO_CONTAINER_FWD # define BOOST_DETAIL_NO_CONTAINER_FWD
# endif # endif
@@ -117,11 +119,11 @@ namespace std
template <class charT> struct char_traits; template <class charT> struct char_traits;
#endif #endif
#if BOOST_CLANG #if defined(BOOST_CONTAINER_FWD_COMPLEX_STRUCT)
template <class T> struct complex; template <class T> struct complex;
#else #else
template <class T> class complex; template <class T> class complex;
#endif #endif
#if !defined(BOOST_CONTAINER_FWD_BAD_DEQUE) #if !defined(BOOST_CONTAINER_FWD_BAD_DEQUE)
template <class T, class Allocator> class deque; template <class T, class Allocator> class deque;

20
include/boost/detail/interlocked.hpp
View File

@@ -54,7 +54,11 @@ extern "C" long __cdecl InterlockedExchangeAdd( long*, long );
#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) #elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
#if defined( __CLRCALL_PURE_OR_CDECL ) #if defined( BOOST_MSVC ) && BOOST_MSVC >= 1600
#include <intrin.h>
#elif defined( __CLRCALL_PURE_OR_CDECL )
extern "C" long __CLRCALL_PURE_OR_CDECL _InterlockedIncrement( long volatile * ); extern "C" long __CLRCALL_PURE_OR_CDECL _InterlockedIncrement( long volatile * );
extern "C" long __CLRCALL_PURE_OR_CDECL _InterlockedDecrement( long volatile * ); extern "C" long __CLRCALL_PURE_OR_CDECL _InterlockedDecrement( long volatile * );
@@ -119,15 +123,15 @@ namespace boost
namespace detail namespace detail
{ {
extern "C"BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedIncrement( long volatile * ); extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedIncrement( long volatile * );
extern "C"BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedDecrement( long volatile * ); extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedDecrement( long volatile * );
extern "C"BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedCompareExchange( long volatile *, long, long ); extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedCompareExchange( long volatile *, long, long );
extern "C"BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchange( long volatile *, long ); extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchange( long volatile *, long );
extern "C"BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchangeAdd( long volatile *, long ); extern "C" BOOST_INTERLOCKED_IMPORT long __stdcall InterlockedExchangeAdd( long volatile *, long );
# if defined(_M_IA64) || defined(_M_AMD64) # if defined(_M_IA64) || defined(_M_AMD64)
extern "C"BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedCompareExchangePointer( void* volatile *, void*, void* ); extern "C" BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedCompareExchangePointer( void* volatile *, void*, void* );
extern "C"BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedExchangePointer( void* volatile *, void* ); extern "C" BOOST_INTERLOCKED_IMPORT void* __stdcall InterlockedExchangePointer( void* volatile *, void* );
# endif # endif
} // namespace detail } // namespace detail

1
test/container_fwd/Jamfile
View File

@@ -11,6 +11,7 @@ project detail/test/container_fwd
<toolset>intel:<warnings>on <toolset>intel:<warnings>on
<toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion" <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
<toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion" <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
<toolset>clang:<cxxflags>"-pedantic -Wextra -Wmismatched-tags"
<warnings-as-errors>on <warnings-as-errors>on
; ;