|
22 | 22 | // # endif |
23 | 23 | // #endif |
24 | 24 |
|
25 | | -// #if !defined(OPENTELEMETRY_HAVE_FEATURE) |
26 | | -// # ifdef __has_feature |
27 | | -// # define OPENTELEMETRY_HAVE_FEATURE(f) __has_feature(f) |
28 | | -// # else |
29 | | -// # define OPENTELEMETRY_HAVE_FEATURE(f) 0 |
30 | | -// # endif |
31 | | -// #endif |
| 25 | +#if !defined(OPENTELEMETRY_HAVE_FEATURE) |
| 26 | +# ifdef __has_feature |
| 27 | +# define OPENTELEMETRY_HAVE_FEATURE(f) __has_feature(f) |
| 28 | +# else |
| 29 | +# define OPENTELEMETRY_HAVE_FEATURE(f) 0 |
| 30 | +# endif |
| 31 | +#endif |
32 | 32 |
|
33 | 33 | /* |
34 | 34 | has feature |
|
44 | 44 | GCC: https://gcc.gnu.org/gcc-5/changes.html |
45 | 45 | Clang: https://clang.llvm.org/docs/LanguageExtensions.html |
46 | 46 | */ |
47 | | -// #if !defined(OPENTELEMETRY_HAVE_ATTRIBUTE) |
48 | | -// # ifdef __has_attribute |
49 | | -// # define OPENTELEMETRY_HAVE_ATTRIBUTE(x) __has_attribute(x) |
50 | | -// # else |
51 | | -// # define OPENTELEMETRY_HAVE_ATTRIBUTE(x) 0 |
52 | | -// # endif |
53 | | -// #endif |
| 47 | +#if !defined(OPENTELEMETRY_HAVE_ATTRIBUTE) |
| 48 | +# ifdef __has_attribute |
| 49 | +# define OPENTELEMETRY_HAVE_ATTRIBUTE(x) __has_attribute(x) |
| 50 | +# else |
| 51 | +# define OPENTELEMETRY_HAVE_ATTRIBUTE(x) 0 |
| 52 | +# endif |
| 53 | +#endif |
54 | 54 |
|
55 | 55 | /* |
56 | 56 | OPENTELEMETRY_HAVE_CPP_ATTRIBUTE |
@@ -470,22 +470,22 @@ point. |
470 | 470 | // OPENTELEMETRY_HAVE_THREAD_SANITIZER |
471 | 471 | // |
472 | 472 | // ThreadSanitizer (TSan) is a fast data race detector. |
473 | | -// #ifndef OPENTELEMETRY_HAVE_THREAD_SANITIZER |
474 | | -// # if defined(__SANITIZE_THREAD__) |
475 | | -// # define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1 |
476 | | -// # elif OPENTELEMETRY_HAVE_FEATURE(thread_sanitizer) |
477 | | -// # define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1 |
478 | | -// # else |
479 | | -// # define OPENTELEMETRY_HAVE_THREAD_SANITIZER 0 |
480 | | -// # endif |
481 | | -// #endif |
| 473 | +#ifndef OPENTELEMETRY_HAVE_THREAD_SANITIZER |
| 474 | +# if defined(__SANITIZE_THREAD__) |
| 475 | +# define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1 |
| 476 | +# elif OPENTELEMETRY_HAVE_FEATURE(thread_sanitizer) |
| 477 | +# define OPENTELEMETRY_HAVE_THREAD_SANITIZER 1 |
| 478 | +# else |
| 479 | +# define OPENTELEMETRY_HAVE_THREAD_SANITIZER 0 |
| 480 | +# endif |
| 481 | +#endif |
482 | 482 |
|
483 | | -// #if OPENTELEMETRY_HAVE_THREAD_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_thread) |
484 | | -// # define OPENTELEMETRY_SANITIZER_NO_THREAD \ |
485 | | -// __attribute__((no_sanitize_thread)) // __attribute__((no_sanitize("thread"))) |
486 | | -// #else |
487 | | -// # define OPENTELEMETRY_SANITIZER_NO_THREAD |
488 | | -// #endif |
| 483 | +#if OPENTELEMETRY_HAVE_THREAD_SANITIZER && OPENTELEMETRY_HAVE_ATTRIBUTE(no_sanitize_thread) |
| 484 | +# define OPENTELEMETRY_SANITIZER_NO_THREAD \ |
| 485 | + __attribute__((no_sanitize_thread)) // __attribute__((no_sanitize("thread"))) |
| 486 | +#else |
| 487 | +# define OPENTELEMETRY_SANITIZER_NO_THREAD |
| 488 | +#endif |
489 | 489 |
|
490 | 490 | // OPENTELEMETRY_HAVE_ADDRESS_SANITIZER |
491 | 491 | // |
|
0 commit comments