Commit: a6e58cd7613f93b77ee4910bb73b411a0f745fb7
Author: Sergey Sharybin
Date: Thu Jun 19 12:47:56 2014 +0600
https://developer.blender.org/rBa6e58cd7613f93b77ee4910bb73b411a0f745fb7
Use Blender codestyle, not Google's one!
===================================================================
M tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
===================================================================
diff --git a/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
b/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
index 34c4773..68b9be3 100644
--- a/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
+++ b/tests/gtests/guardedalloc/guardedalloc_alignment_test.cc
@@ -6,42 +6,46 @@
namespace {
-void DoBasicAlignmentChecks(const int alignment) {
- int *foo, *bar;
+void DoBasicAlignmentChecks(const int alignment)
+{
+ int *foo, *bar;
- foo = (int *) MEM_mallocN_aligned(sizeof(int) * 10, alignment, "test");
- CHECK_ALIGNMENT(foo, alignment);
+ foo = (int *) MEM_mallocN_aligned(sizeof(int) * 10, alignment, "test");
+ CHECK_ALIGNMENT(foo, alignment);
- bar = (int *) MEM_dupallocN(foo);
- CHECK_ALIGNMENT(bar, alignment);
- MEM_freeN(bar);
+ bar = (int *) MEM_dupallocN(foo);
+ CHECK_ALIGNMENT(bar, alignment);
+ MEM_freeN(bar);
- foo = (int *) MEM_reallocN(foo, sizeof(int) * 5);
- CHECK_ALIGNMENT(foo, alignment);
+ foo = (int *) MEM_reallocN(foo, sizeof(int) * 5);
+ CHECK_ALIGNMENT(foo, alignment);
- foo = (int *) MEM_recallocN(foo, sizeof(int) * 5);
- CHECK_ALIGNMENT(foo, alignment);
+ foo = (int *) MEM_recallocN(foo, sizeof(int) * 5);
+ CHECK_ALIGNMENT(foo, alignment);
- MEM_freeN(foo);
+ MEM_freeN(foo);
}
} // namespace
-TEST(guardedalloc, LockfreeAlignedAlloc16) {
- DoBasicAlignmentChecks(16);
+TEST(guardedalloc, LockfreeAlignedAlloc16)
+{
+ DoBasicAlignmentChecks(16);
}
-TEST(guardedalloc, GuardedAlignedAlloc16) {
- MEM_use_guarded_allocator();
- DoBasicAlignmentChecks(16);
+TEST(guardedalloc, GuardedAlignedAlloc16)
+{
+ MEM_use_guarded_allocator();
+ DoBasicAlignmentChecks(16);
}
// On Apple we currently support 16 bit alignment only.
// Harmless for Blender, but would be nice to support
// eventually.
#ifndef __APPLE__
-TEST(guardedalloc, GuardedAlignedAlloc32) {
- MEM_use_guarded_allocator();
- DoBasicAlignmentChecks(16);
+TEST(guardedalloc, GuardedAlignedAlloc32)
+{
+ MEM_use_guarded_allocator();
+ DoBasicAlignmentChecks(16);
}
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
