diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/guardedalloc/cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/guardedalloc/cpp')
-rw-r--r-- | intern/guardedalloc/cpp/mallocn.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp index 6582bf49545..0804e096dc6 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -18,7 +18,6 @@ * \ingroup MEM */ - #include <new> #include "../MEM_guardedalloc.h" @@ -28,33 +27,31 @@ void *operator new[](size_t size, const char *str) throw(std::bad_alloc); /* not default but can be used when needing to set a string */ void *operator new(size_t size, const char *str) throw(std::bad_alloc) { - return MEM_mallocN(size, str); + return MEM_mallocN(size, str); } void *operator new[](size_t size, const char *str) throw(std::bad_alloc) { - return MEM_mallocN(size, str); + return MEM_mallocN(size, str); } - void *operator new(size_t size) throw(std::bad_alloc) { - return MEM_mallocN(size, "C++/anonymous"); + return MEM_mallocN(size, "C++/anonymous"); } void *operator new[](size_t size) throw(std::bad_alloc) { - return MEM_mallocN(size, "C++/anonymous[]"); + return MEM_mallocN(size, "C++/anonymous[]"); } - void operator delete(void *p) throw() { - /* delete NULL is valid in c++ */ - if (p) - MEM_freeN(p); + /* delete NULL is valid in c++ */ + if (p) + MEM_freeN(p); } void operator delete[](void *p) throw() { - /* delete NULL is valid in c++ */ - if (p) - MEM_freeN(p); + /* delete NULL is valid in c++ */ + if (p) + MEM_freeN(p); } |