Add support for Intel C++ compiler for Linux (icc 15)

[libcds.git] / cds / details / defs.h

diff --git a/cds/details/defs.h b/cds/details/defs.h
index 38340ae59df29f2d14de155e921ec087ddd94eb5..ff482c1787248ed49b227d28acb756338eb927c1 100644 (file)
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -320,10 +320,10 @@ namespace cds {}
 // CDS_VERIFY: Debug - assert(_expr); Release - _expr
 #ifdef CDS_DEBUG
 #   define CDS_VERIFY( _expr )    assert( _expr )
-#   define CDS_DEBUG_DO( _expr )        _expr
+#   define CDS_DEBUG_ONLY( _expr )        _expr
 #else
 #   define CDS_VERIFY( _expr )    _expr
-#   define CDS_DEBUG_DO( _expr )
+#   define CDS_DEBUG_ONLY( _expr )
 #endif
 
 #ifdef CDS_STRICT
@@ -338,17 +338,6 @@ namespace cds {}
 
 #define CDS_NOEXCEPT            CDS_NOEXCEPT_SUPPORT
 #define CDS_NOEXCEPT_( expr )   CDS_NOEXCEPT_SUPPORT_( expr )
-#ifndef CDS_NOEXCEPT_DEFAULTED
-    // Some compilers do not allow noexcept specification in defaulted function
-    // For example, GCC 4.6.x raise following error:
-    //  void foo() noexcept = default
-    //  error: function \91foo\92 defaulted on its first declaration must not have an exception-specification
-    // For such compiler empty CDS_NOEXCEPT_DEFAULTED must be defined
-#   define CDS_NOEXCEPT_DEFAULTED         CDS_NOEXCEPT
-#   define CDS_NOEXCEPT_DEFAULTED_(expr)  CDS_NOEXCEPT_( expr )
-#endif
-
-#define CDS_EMPLACE_SUPPORT
 
 #ifdef CDS_CXX11_INLINE_NAMESPACE_SUPPORT
 #   define CDS_CXX11_INLINE_NAMESPACE   inline
@@ -404,8 +393,6 @@ namespace cds {
  Common things
 **************************************************************************/
 
-#include <cds/details/numtraits.h>
-
 namespace cds {
 
     /// Base of all exceptions in the library
@@ -469,7 +456,7 @@ namespace cds {
     {
         if ( !bCond ) {
             char buf[4096];
-#   if CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL
+#   if CDS_COMPILER == CDS_COMPILER_MSVC || (CDS_COMPILER == CDS_COMPILER_INTEL && CDS_OS_INTERFACE == CS_OSI_WINDOWS)
             _snprintf_s( buf, sizeof(buf)/sizeof(buf[0]), _TRUNCATE, pszMsg, pszFile, nLine );
 #   else
             snprintf( buf, sizeof(buf)/sizeof(buf[0]), pszMsg, pszFile, nLine );