diff options
| author | Copybara-Service <copybara-worker@google.com> | 2023-03-28 07:04:28 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-28 07:04:28 -0700 |
| commit | ca0d46e95dd13e331bb9419b0b0e3af758e8644c (patch) | |
| tree | f84a931715ab9a23c2394b07f6f68e762990e30b | |
| parent | 3656c2713e08bd5dadae740f71ef37a92336027b (diff) | |
| parent | 5d6ba6d3b0a836f373d5ae83688880381cb7b3d4 (diff) | |
| download | googletest-git-ca0d46e95dd13e331bb9419b0b0e3af758e8644c.tar.gz | |
Merge pull request #4103 from gonzalobg:bugfix/nvcxx_support
PiperOrigin-RevId: 520017251
Change-Id: Ib2be28787b739344c80a5d937f875737ba44a0ec
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index eb78992f..7846c9e1 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -861,7 +861,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // Ask the compiler not to perform tail call optimization inside // the marked function. #define GTEST_NO_TAIL_CALL_ __attribute__((disable_tail_calls)) -#elif __GNUC__ +#elif defined(__GNUC__) && !defined(__NVCOMPILER) #define GTEST_NO_TAIL_CALL_ \ __attribute__((optimize("no-optimize-sibling-calls"))) #else |