diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 22:12:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 22:12:08 +0400 |
| commit | 47826118d1e95007e9d1b909b0e96d2c098a6990 (patch) | |
| tree | 50be73f093f3c2fc837ff9804be20ba2933b4bd0 /source/blender/blenlib | |
| parent | 481658867ec53b3f5dc82d183410d3d35982bad4 (diff) | |
style cleanup: also fix for TIMEIT macro
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 40 | ||||
| -rw-r--r-- | source/blender/blenlib/PIL_time.h | 4 |
2 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index f027fb57842..f761f2edcba 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -148,29 +148,29 @@ *(v1) = *(v2); \ *(v1 + 1) = *(v2 + 1); \ } (void)0 -#define VECADD(v1, v2, v3) { \ - *(v1) = *(v2) + *(v3); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2); \ +#define VECADD(v1, v2, v3) { \ + *(v1) = *(v2) + *(v3); \ + *(v1 + 1) = *(v2 + 1) + *(v3 + 1); \ + *(v1 + 2) = *(v2 + 2) + *(v3 + 2); \ } (void)0 -#define VECSUB(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2); \ +#define VECSUB(v1, v2, v3) { \ + *(v1) = *(v2) - *(v3); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ + *(v1 + 2) = *(v2 + 2) - *(v3 + 2); \ } (void)0 -#define VECSUB2D(v1, v2, v3) { \ - *(v1) = *(v2) - *(v3); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ +#define VECSUB2D(v1, v2, v3) { \ + *(v1) = *(v2) - *(v3); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1); \ } (void)0 -#define VECADDFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) + *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ +#define VECADDFAC(v1, v2, v3, fac) { \ + *(v1) = *(v2) + *(v3) * (fac); \ + *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac); \ + *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac); \ } (void)0 -#define VECSUBFAC(v1, v2, v3, fac) { \ - *(v1) = *(v2) - *(v3) * (fac); \ - *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac); \ - *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac); \ +#define VECSUBFAC(v1, v2, v3, fac) { \ + *(v1) = *(v2) - *(v3) * (fac); \ + *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac); \ + *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac); \ } (void)0 #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2]) @@ -223,7 +223,7 @@ #define SWITCH_SHORT(a) { \ char s_i, *p_i; \ p_i = (char *)&(a); \ - s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i; \ + s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i; \ } (void)0 diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h index 6153007be80..288d2fe78e5 100644 --- a/source/blender/blenlib/PIL_time.h +++ b/source/blender/blenlib/PIL_time.h @@ -61,7 +61,7 @@ void PIL_sleep_ms(int ms); double _timeit_##var = PIL_check_seconds_timer(); \ printf("time start (" #var "): " AT "\n"); \ fflush(stdout); \ - { (void) \ + { (void)0 \ #define TIMEIT_VALUE(var) (float)(PIL_check_seconds_timer() - _timeit_##var) @@ -71,7 +71,7 @@ void PIL_sleep_ms(int ms); } \ printf("time end (" #var "): %.6f" " " AT "\n", TIMEIT_VALUE(var)); \ fflush(stdout); \ -} (void) \ +} (void)0 \ #ifdef __cplusplus } |