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 | android_abi_cpp-a0f99286d0909f7a30b0bee742bec2a0b62c4dd0.tar.gz android_abi_cpp-a0f99286d0909f7a30b0bee742bec2a0b62c4dd0.tar.bz2 android_abi_cpp-a0f99286d0909f7a30b0bee742bec2a0b62c4dd0.zip | |
Merge "cxxabi: declare abi after __cxxabiv1 namespace"staging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.1cm-12.0
| -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__) */ |