diff options
| author | Nick Kralevich <nnk@google.com> | 2013-10-14 21:24:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-14 21:24:48 +0000 |
| commit | a0f99286d0909f7a30b0bee742bec2a0b62c4dd0 (patch) | |
| tree | ee09269f4b8a05fdf8f72a0686c3bfd22049473a | |
| parent | 18f1b5e28734183ff8073fe86dc46bc4ebba8a59 (diff) | |
| parent | af0683e34e707f56aa78e39f99b50c89077152a2 (diff) | |
| download | cpp-a0f99286d0909f7a30b0bee742bec2a0b62c4dd0.tar.gz | |
Merge "cxxabi: declare abi after __cxxabiv1 namespace"android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseidea133-weekly-releaseidea133
| -rw-r--r-- | include/cxxabi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cxxabi.h b/include/cxxabi.h index 3bd8a58..516e6a8 100644 --- a/include/cxxabi.h +++ b/include/cxxabi.h @@ -31,8 +31,6 @@ #include <typeinfo> -namespace abi = __cxxabiv1; - namespace __cxxabiv1 { extern "C" void __cxa_pure_virtual(); @@ -179,5 +177,7 @@ namespace __cxxabiv1 }; } +namespace abi = __cxxabiv1; + #endif /* defined(__GABIXX_CXXABI_H__) */ |