diff options
| -rw-r--r-- | include/cxxabi.h | 56 | ||||
| -rw-r--r-- | src/cxa_aux_runtime.cpp | 10 | ||||
| -rw-r--r-- | test/test_guard.cpp | 12 |
3 files changed, 39 insertions, 39 deletions
diff --git a/include/cxxabi.h b/include/cxxabi.h index b92b2fa..af0e000 100644 --- a/include/cxxabi.h +++ b/include/cxxabi.h @@ -18,10 +18,10 @@ #include <stddef.h> #include <stdint.h> -#define LIBCXXABI_NORETURN +#define LIBCXXABI_NORETURN namespace std { - class type_info; // forward declaration + class type_info; // forward declaration } @@ -73,72 +73,72 @@ extern void __cxa_guard_abort(uint64_t*); // 3.3.3 Array Construction and Destruction API extern void* __cxa_vec_new(size_t element_count, - size_t element_size, + size_t element_size, size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*) ); + void (*constructor)(void*), + void (*destructor)(void*) ); extern void* __cxa_vec_new2(size_t element_count, - size_t element_size, + size_t element_size, size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*), + 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 element_size, size_t padding_size, - void (*constructor)(void*), - void (*destructor)(void*), + 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*) ); + 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*) ); + 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*) ); + void (*destructor)(void*) ); extern void __cxa_vec_delete(void* array_address, size_t element_size, size_t padding_size, - void (*destructor)(void*) ); + void (*destructor)(void*) ); extern void __cxa_vec_delete2(void* array_address, size_t element_size, size_t padding_size, - void (*destructor)(void*), + 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)); + 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*) ); + void* src_array, + size_t element_count, + size_t element_size, + void (*constructor) (void*, void*), + void (*destructor)(void*) ); // 3.3.5.3 Runtime API @@ -148,9 +148,9 @@ 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); + char* output_buffer, + size_t* length, + int* status); } // extern "C" } // namespace __cxxabiv1 diff --git a/src/cxa_aux_runtime.cpp b/src/cxa_aux_runtime.cpp index cf6851b..abd8091 100644 --- a/src/cxa_aux_runtime.cpp +++ b/src/cxa_aux_runtime.cpp @@ -5,9 +5,9 @@ // This file is dual licensed under the MIT and the University of Illinois Open // Source Licenses. See LICENSE.TXT for details. // -// -// This file implements the "Auxiliary Runtime APIs" -// http://www.codesourcery.com/public/cxx-abi/abi-eh.html#cxx-aux +// +// This file implements the "Auxiliary Runtime APIs" +// http://www.codesourcery.com/public/cxx-abi/abi-eh.html#cxx-aux //===----------------------------------------------------------------------===// #include "cxxabi.h" @@ -21,12 +21,12 @@ extern "C" LIBCXXABI_NORETURN void __cxa_bad_cast (void) { - throw std::bad_cast(); + throw std::bad_cast(); } LIBCXXABI_NORETURN void __cxa_bad_typeid(void) { - throw std::bad_typeid(); + throw std::bad_typeid(); } } // extern "C" diff --git a/test/test_guard.cpp b/test/test_guard.cpp index d31e577..96af56a 100644 --- a/test/test_guard.cpp +++ b/test/test_guard.cpp @@ -78,7 +78,7 @@ namespace test4 { static int run_count = 0; int increment() { ++run_count; - return 0; + return 0; } void helper() { @@ -89,7 +89,7 @@ namespace test4 { std::thread t1(helper), t2(helper); t1.join(); t2.join(); - assert(run_count == 1); + assert(run_count == 1); } } @@ -104,7 +104,7 @@ namespace test5 { int one() { static int b = zero(); - return 0; + return 0; } void another_helper() { @@ -113,14 +113,14 @@ namespace test5 { void helper() { static int a = one(); - std::thread t(another_helper); - t.join(); + std::thread t(another_helper); + t.join(); } void test() { std::thread t(helper); t.join(); - assert(run_count == 1); + assert(run_count == 1); } } |