diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-07 04:47:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-07 04:47:52 +0000 |
| commit | f3f879e7d9986a386806b75ba7ad953d8b9f395a (patch) | |
| tree | a27cf37d0cbda932e117f1d44866d270eea03ef1 | |
| parent | 8881570a809d0cd7f0bc0b1d2c42767c568276ca (diff) | |
| parent | 270953b4499f462f6a880101ee61c9a0b3e1ecb5 (diff) | |
| download | libchrome-f3f879e7d9986a386806b75ba7ad953d8b9f395a.tar.gz | |
Snap for 10273262 from 270953b4499f462f6a880101ee61c9a0b3e1ecb5 to sdk-release
Change-Id: I2da68a75c6186c38a2e688cfc85d73eb9d6b831f
| -rw-r--r-- | base/template_util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/template_util.h b/base/template_util.h index 8544aa2945..e4d03a24c3 100644 --- a/base/template_util.h +++ b/base/template_util.h @@ -22,8 +22,9 @@ // you attempt to mix an earlier version of libstdc++ with >= GCC5. But // that's unlikely to work out, especially as GCC5 changed ABI. #define CR_GLIBCXX_5_0_0 20150123 -#if (defined(__GNUC__) && __GNUC__ < 5) || \ - (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0) +// `!defined(__clang__)` is a local android patch +#if !defined(__clang__) && ((defined(__GNUC__) && __GNUC__ < 5) || \ + (defined(__GLIBCXX__) && __GLIBCXX__ == CR_GLIBCXX_5_0_0)) #define CR_USE_FALLBACKS_FOR_OLD_EXPERIMENTAL_GLIBCXX #endif |