diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-04 13:58:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 13:58:55 -0400 |
| commit | fbe3c9453332c9d9aae95b09f788aa9305258653 (patch) | |
| tree | 90cdd71a732965df226ac732139f6f561854ae69 | |
| parent | a0c27bd8a5357f2c5f1438b551816a1f9e5668c6 (diff) | |
| parent | 43776990663c08c4d207658bc5756058da1040bf (diff) | |
| download | googletest-fbe3c9453332c9d9aae95b09f788aa9305258653.tar.gz googletest-fbe3c9453332c9d9aae95b09f788aa9305258653.tar.bz2 googletest-fbe3c9453332c9d9aae95b09f788aa9305258653.zip | |
Merge branch 'master' into fix_locale_win
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 725aa089..73e9bf86 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -4549,7 +4549,9 @@ void UnitTest::AddTestPartResult( // when a failure happens and both the --gtest_break_on_failure and // the --gtest_catch_exceptions flags are specified. DebugBreak(); -#elif (defined(__clang__) || defined(__GNUC__)) && (defined(__x86_64__) || defined(__i386__)) +#elif (!defined(__native_client__)) && \ + ((defined(__clang__) || defined(__GNUC__)) && \ + (defined(__x86_64__) || defined(__i386__))) // with clang/gcc we can achieve the same effect on x86 by invoking int3 asm("int3"); #else |