X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_aux.h;h=3de8d4a9deeac2361fd981b4d1fcfc9406d6beb4;hb=41777e3d5dc655f59a8c3bcd071639e6878e853a;hp=8990ed8da1faa443c1e9a7b10821db1fdc52724b;hpb=1cc4363093c919f79eafac209bb5c41548d3f88f;p=pdclib diff --git a/internals/_PDCLIB_aux.h b/internals/_PDCLIB_aux.h index 8990ed8..3de8d4a 100644 --- a/internals/_PDCLIB_aux.h +++ b/internals/_PDCLIB_aux.h @@ -58,6 +58,14 @@ #define _PDCLIB_inline inline #endif +#if _PDCLIB_CXX_VERSION >= 2011 + #define _PDCLIB_nothrow noexcept + #define _PDCLIB_noexcept(x) noexcept(x) +#elif _PDCLIB_CXX_VERSION + #define _PDCLIB_nothrow throw() + #define _PDCLIB_noexcept +#endif + #if _PDCLIB_CXX_VERSION >= 2011 // Hold off on C++ attribute syntax for now // #define _PDCLIB_noreturn [[noreturn]] @@ -71,9 +79,9 @@ #endif #ifdef __GNUC__ - #ifndef _PDCLIB_EXPORT - #define _PDCLIB_EXPORT __attribute__((__visibility__("protected"))) - #endif + #ifndef _PDCLIB_EXPORT + #define _PDCLIB_EXPORT __attribute__((__visibility__("protected"))) + #endif #ifndef _PDCLIB_IMPORT #define _PDCLIB_IMPORT @@ -83,6 +91,11 @@ #define _PDCLIB_HIDDEN __attribute__((__visibility__("hidden"))) #endif + #ifndef _PDCLIB_nothrow + #define _PDCLIB_nothrow __attribute__((__nothrow__)) + #define _PDCLIB_noexcept + #endif + #ifndef _PDCLIB_restrict #define _PDCLIB_restrict __restrict #endif @@ -97,6 +110,11 @@ #endif #endif +#ifndef _PDCLIB_nothrow + #define _PDCLIB_nothrow + #define _PDCLIB_noexcept +#endif + #ifndef _PDCLIB_EXPORT #define _PDCLIB_EXPORT #endif @@ -159,6 +177,7 @@ #define _PDCLIB_cc( x, y ) x ## y #define _PDCLIB_concat( x, y ) _PDCLIB_cc( x, y ) +#define _PDCLIB_concat3( x, y, z ) _PDCLIB_concat( _PDCLIB_concat( x, y ), z ) #define _PDCLIB_symbol2value( x ) #x #define _PDCLIB_symbol2string( x ) _PDCLIB_symbol2value( x ) @@ -194,7 +213,7 @@ #define _PDCLIB_CXX_MAX(max) _PDCLIB_CXX_MINMAX(0, max) #define _PDCLIB_XOPEN_MAX(max) _PDCLIB_XOPEN_MINMAX(0, max) #define _PDCLIB_POSIX_MAX(max) _PDCLIB_POSIX_MINMAX(0, max) -#if defined(_PDCLIB_ALL) || defined(_PDCLIB_BUILD) +#if defined(_PDCLIB_EXTENSIONS) || defined(_PDCLIB_BUILD) #define _PDCLIB_C_MINMAX(min, max) 1 #define _PDCLIB_CXX_MINMAX(min, max) 1 #define _PDCLIB_POSIX_MINMAX(min, max) 1 @@ -233,4 +252,4 @@ #endif #endif -#endif \ No newline at end of file +#endif