diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-12-04 02:14:41 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-12-04 02:14:41 +0000 |
commit | 77a304b28be4b50a508298d6a0e40ee9d4bb3ccd (patch) | |
tree | 5658445ec8889962474dd6c8be1a585fc7795b3f /include | |
parent | 4c91e387a7e126a1f3c9706df4f2c65f350859b0 (diff) |
c++abi: whitespace adjustment
Cleanup some code with clang-format to make the following change easier to
identify material difference. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@254690 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/__cxxabi_config.h | 2 | ||||
-rw-r--r-- | include/cxxabi.h | 157 |
2 files changed, 66 insertions, 93 deletions
diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h index c040a06..957754f 100644 --- a/include/__cxxabi_config.h +++ b/include/__cxxabi_config.h @@ -10,7 +10,7 @@ #ifndef ____CXXABI_CONFIG_H #define ____CXXABI_CONFIG_H -#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ +#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ !defined(__ARM_DWARF_EH__) #define LIBCXXABI_ARM_EHABI 1 #else diff --git a/include/cxxabi.h b/include/cxxabi.h index f29253c..253a3df 100644 --- a/include/cxxabi.h +++ b/include/cxxabi.h @@ -35,35 +35,32 @@ namespace __cxxabiv1 { extern "C" { // 2.4.2 Allocating the Exception Object -extern void * __cxa_allocate_exception(size_t thrown_size) throw(); -extern void __cxa_free_exception(void * thrown_exception) throw(); +extern void *__cxa_allocate_exception(size_t thrown_size) throw(); +extern void __cxa_free_exception(void *thrown_exception) throw(); // 2.4.3 Throwing the Exception Object -extern LIBCXXABI_NORETURN void __cxa_throw(void * thrown_exception, - std::type_info * tinfo, void (*dest)(void *)); +extern LIBCXXABI_NORETURN void __cxa_throw(void *thrown_exception, + std::type_info *tinfo, + void (*dest)(void *)); // 2.5.3 Exception Handlers -extern void * __cxa_get_exception_ptr(void * exceptionObject) throw(); -extern void * __cxa_begin_catch(void * exceptionObject) throw(); +extern void *__cxa_get_exception_ptr(void *exceptionObject) throw(); +extern void *__cxa_begin_catch(void *exceptionObject) throw(); extern void __cxa_end_catch(); #if LIBCXXABI_ARM_EHABI -extern bool __cxa_begin_cleanup(void * exceptionObject) throw(); +extern bool __cxa_begin_cleanup(void *exceptionObject) throw(); extern void __cxa_end_cleanup(); #endif -extern std::type_info * __cxa_current_exception_type(); +extern std::type_info *__cxa_current_exception_type(); // 2.5.4 Rethrowing Exceptions extern LIBCXXABI_NORETURN void __cxa_rethrow(); - - // 2.6 Auxiliary Runtime APIs extern LIBCXXABI_NORETURN void __cxa_bad_cast(void); extern LIBCXXABI_NORETURN void __cxa_bad_typeid(void); extern LIBCXXABI_NORETURN void __cxa_throw_bad_array_new_length(void); - - // 3.2.6 Pure Virtual Function API extern LIBCXXABI_NORETURN void __cxa_pure_virtual(void); @@ -72,98 +69,74 @@ extern LIBCXXABI_NORETURN void __cxa_deleted_virtual(void); // 3.3.2 One-time Construction API #ifdef __arm__ -extern int __cxa_guard_acquire(uint32_t*); -extern void __cxa_guard_release(uint32_t*); -extern void __cxa_guard_abort(uint32_t*); +extern int __cxa_guard_acquire(uint32_t *); +extern void __cxa_guard_release(uint32_t *); +extern void __cxa_guard_abort(uint32_t *); #else -extern int __cxa_guard_acquire(uint64_t*); -extern void __cxa_guard_release(uint64_t*); -extern void __cxa_guard_abort(uint64_t*); +extern int __cxa_guard_acquire(uint64_t *); +extern void __cxa_guard_release(uint64_t *); +extern void __cxa_guard_abort(uint64_t *); #endif // 3.3.3 Array Construction and Destruction API -extern void* __cxa_vec_new(size_t element_count, - size_t element_size, - size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*)); - -extern void* __cxa_vec_new2(size_t element_count, - size_t element_size, - size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*), - void* (*alloc)(size_t), - void (*dealloc)(void*)); - -extern void* __cxa_vec_new3(size_t element_count, - size_t element_size, - size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*), - void* (*alloc)(size_t), - void (*dealloc)(void*, size_t)); - -extern void __cxa_vec_ctor(void* array_address, - size_t element_count, - size_t element_size, - void (*constructor)(void*), - void (*destructor)(void*)); - -extern void __cxa_vec_dtor(void* array_address, - size_t element_count, - size_t element_size, - void (*destructor)(void*)); - -extern void __cxa_vec_cleanup(void* array_address, - size_t element_count, - size_t element_size, - void (*destructor)(void*)); - -extern void __cxa_vec_delete(void* array_address, - size_t element_size, - size_t padding_size, - void (*destructor)(void*)); - -extern void __cxa_vec_delete2(void* array_address, - size_t element_size, - size_t padding_size, - void (*destructor)(void*), - void (*dealloc)(void*)); - -extern void __cxa_vec_delete3(void* __array_address, - size_t element_size, - size_t padding_size, - void (*destructor)(void*), - void (*dealloc)(void*, size_t)); - -extern void __cxa_vec_cctor(void* dest_array, - void* src_array, - size_t element_count, - size_t element_size, - void (*constructor)(void*, void*), - void (*destructor)(void*)); +extern void *__cxa_vec_new(size_t element_count, size_t element_size, + size_t padding_size, void (*constructor)(void *), + void (*destructor)(void *)); + +extern void *__cxa_vec_new2(size_t element_count, size_t element_size, + size_t padding_size, void (*constructor)(void *), + void (*destructor)(void *), void *(*alloc)(size_t), + void (*dealloc)(void *)); + +extern void *__cxa_vec_new3(size_t element_count, size_t element_size, + size_t padding_size, void (*constructor)(void *), + void (*destructor)(void *), void *(*alloc)(size_t), + void (*dealloc)(void *, size_t)); + +extern void __cxa_vec_ctor(void *array_address, size_t element_count, + size_t element_size, void (*constructor)(void *), + void (*destructor)(void *)); + +extern void __cxa_vec_dtor(void *array_address, size_t element_count, + size_t element_size, void (*destructor)(void *)); + +extern void __cxa_vec_cleanup(void *array_address, size_t element_count, + size_t element_size, void (*destructor)(void *)); + +extern void __cxa_vec_delete(void *array_address, size_t element_size, + size_t padding_size, void (*destructor)(void *)); + +extern void __cxa_vec_delete2(void *array_address, size_t element_size, + size_t padding_size, void (*destructor)(void *), + void (*dealloc)(void *)); + +extern void __cxa_vec_delete3(void *__array_address, size_t element_size, + size_t padding_size, void (*destructor)(void *), + void (*dealloc)(void *, size_t)); + +extern void __cxa_vec_cctor(void *dest_array, void *src_array, + size_t element_count, size_t element_size, + void (*constructor)(void *, void *), + void (*destructor)(void *)); // 3.3.5.3 Runtime API -extern int __cxa_atexit(void (*f)(void*), void* p, void* d); -extern int __cxa_finalize(void*); +extern int __cxa_atexit(void (*f)(void *), void *p, void *d); +extern int __cxa_finalize(void *); // 3.4 Demangler API -extern char* __cxa_demangle(const char* mangled_name, - char* output_buffer, - size_t* length, - int* status); +extern char *__cxa_demangle(const char *mangled_name, char *output_buffer, + size_t *length, int *status); // Apple additions to support C++ 0x exception_ptr class // These are primitives to wrap a smart pointer around an exception object -extern void * __cxa_current_primary_exception() throw(); -extern void __cxa_rethrow_primary_exception(void* primary_exception); -extern void __cxa_increment_exception_refcount(void* primary_exception) throw(); -extern void __cxa_decrement_exception_refcount(void* primary_exception) throw(); +extern void *__cxa_current_primary_exception() throw(); +extern void __cxa_rethrow_primary_exception(void *primary_exception); +extern void __cxa_increment_exception_refcount(void *primary_exception) throw(); +extern void __cxa_decrement_exception_refcount(void *primary_exception) throw(); // Apple extension to support std::uncaught_exception() -extern bool __cxa_uncaught_exception () throw(); -extern unsigned int __cxa_uncaught_exceptions() throw(); +extern bool __cxa_uncaught_exception() throw(); +extern unsigned int __cxa_uncaught_exceptions() throw(); #ifdef __linux__ // Linux TLS support. Not yet an official part of the Itanium ABI. @@ -171,7 +144,7 @@ extern unsigned int __cxa_uncaught_exceptions() throw(); extern int __cxa_thread_atexit(void (*)(void *), void *, void *) throw(); #endif - } // extern "C" +} // extern "C" } // namespace __cxxabiv1 namespace abi = __cxxabiv1; |